diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.h
index 2355093d7d15b2cbec27093e8bdc722cef246563..1a9e5beb626bd364119a09d6bba841af4ff0d850 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.h
@@ -5,6 +5,7 @@
 #include "MantidKernel/System.h"
 #include "MantidKernel/UnitLabel.h"
 #include "MantidGeometry/MDGeometry/MDFrame.h"
+#include "MantidGeometry/DllConfig.h"
 #include <memory>
 
 namespace Mantid {
@@ -33,14 +34,14 @@ namespace Geometry {
   File change history is stored at: <https://github.com/mantidproject/mantid>
   Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
-class DLLExport HKL : public MDFrame {
+class MANTID_GEOMETRY_DLL HKL : public MDFrame {
 public:
   HKL(const HKL& other);
   HKL& operator=(const HKL& other);
   HKL(std::unique_ptr<Kernel::MDUnit>& unit);
   HKL(Kernel::MDUnit* unit);
   virtual ~HKL();
-  static const std::string HKLName;
+  static const MANTID_GEOMETRY_DLL std::string HKLName;
 
   // MDFrame interface
   Kernel::UnitLabel getUnitLabel() const;
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.h
index 199e26ac0923bdc0e52adc68c4ad2a52fb11cdd2..54cff18c68f1a7c1ad765ab873bebee66abaddb2 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.h
@@ -5,6 +5,7 @@
 #include "MantidKernel/System.h"
 #include "MantidKernel/UnitLabel.h"
 #include "MantidGeometry/MDGeometry/MDFrame.h"
+#include "MantidGeometry/DllConfig.h"
 #include <memory>
 
 namespace Mantid {
@@ -33,7 +34,7 @@ namespace Geometry {
   File change history is stored at: <https://github.com/mantidproject/mantid>
   Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
-class DLLExport QLab : public MDFrame{
+class MANTID_GEOMETRY_DLL QLab : public MDFrame{
 public:
 
   QLab();
@@ -45,7 +46,7 @@ public:
   QLab *clone() const;
 
   // Type name
-  static const std::string QLabName;
+  static const MANTID_GEOMETRY_DLL std::string QLabName;
 
 private:
 
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.h
index bd53c447837711a2c10030c1d5a8fd0064c4ba9d..69ea2a8f714a6167beb7befa38e19c8b94dbb6af 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.h
@@ -5,6 +5,7 @@
 #include "MantidKernel/System.h"
 #include "MantidKernel/UnitLabel.h"
 #include "MantidGeometry/MDGeometry/MDFrame.h"
+#include "MantidGeometry/DllConfig.h"
 #include <memory>
 
 namespace Mantid {
@@ -33,9 +34,9 @@ namespace Geometry {
   File change history is stored at: <https://github.com/mantidproject/mantid>
   Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
-class DLLExport QSample : public MDFrame {
+class MANTID_GEOMETRY_DLL QSample : public MDFrame {
 public:
-  static const std::string QSampleName;
+  static const MANTID_GEOMETRY_DLL std::string QSampleName;
   QSample();
   virtual ~QSample();
   Kernel::UnitLabel getUnitLabel() const;