diff --git a/Framework/API/inc/MantidAPI/AlgorithmFactory.h b/Framework/API/inc/MantidAPI/AlgorithmFactory.h
index a9d7bb805be8bdfb2fdeea1352aaa408e5d67e24..3869d01863ab49b2f8ad868e38520c82809d41db 100644
--- a/Framework/API/inc/MantidAPI/AlgorithmFactory.h
+++ b/Framework/API/inc/MantidAPI/AlgorithmFactory.h
@@ -176,7 +176,7 @@ template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<AlgorithmFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<AlgorithmFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<AlgorithmFactoryImpl>
AlgorithmFactory;
/// Convenient typedef for an UpdateNotification
diff --git a/Framework/API/inc/MantidAPI/AnalysisDataService.h b/Framework/API/inc/MantidAPI/AnalysisDataService.h
index b99dfb0f5dd135756d256f8bcffb0c1f4035216d..d56ddcef2bd2619386e850017dccebac40e0e149 100644
--- a/Framework/API/inc/MantidAPI/AnalysisDataService.h
+++ b/Framework/API/inc/MantidAPI/AnalysisDataService.h
@@ -186,7 +186,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<AnalysisDataServiceImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<AnalysisDataServiceImpl>
+typedef Mantid::Kernel::SingletonHolder<AnalysisDataServiceImpl>
AnalysisDataService;
typedef Mantid::Kernel::DataService<Mantid::API::Workspace>::AddNotification
diff --git a/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h b/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h
index 78a4d211d36a27307ad223922c6bed82dc6ccd54..875d6950d1430b238767ba8818b0847ee0f8cae2 100644
--- a/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h
+++ b/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h
@@ -64,7 +64,7 @@ template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<ArchiveSearchFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<ArchiveSearchFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<ArchiveSearchFactoryImpl>
ArchiveSearchFactory;
}
}
diff --git a/Framework/API/inc/MantidAPI/CatalogFactory.h b/Framework/API/inc/MantidAPI/CatalogFactory.h
index 391bcf6753f3db35e0e2de3166e9c2798277b696..dc09ed9e26357aaf276078a69fac69ebbbb2d136 100644
--- a/Framework/API/inc/MantidAPI/CatalogFactory.h
+++ b/Framework/API/inc/MantidAPI/CatalogFactory.h
@@ -85,7 +85,7 @@ template class MANTID_API_DLL
#endif /* _WIN32 */
/// The specialisation of the SingletonHolder class that holds the
/// CatalogFactory
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<CatalogFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<CatalogFactoryImpl>
CatalogFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/CatalogManager.h b/Framework/API/inc/MantidAPI/CatalogManager.h
index 7b8cf565a7b0827eaa4f863ed7481cce604d91e5..05b65ebc7945af211539b45529ae73590d304003 100644
--- a/Framework/API/inc/MantidAPI/CatalogManager.h
+++ b/Framework/API/inc/MantidAPI/CatalogManager.h
@@ -70,7 +70,7 @@ private:
#ifdef _WIN32
template class MANTID_API_DLL Kernel::SingletonHolder<CatalogManagerImpl>;
#endif
-typedef MANTID_API_DLL Kernel::SingletonHolder<CatalogManagerImpl>
+typedef Kernel::SingletonHolder<CatalogManagerImpl>
CatalogManager;
}
}
diff --git a/Framework/API/inc/MantidAPI/ColumnFactory.h b/Framework/API/inc/MantidAPI/ColumnFactory.h
index 2d85aa0759298b3fd0d1b35325f6b15efc31b2af..e17431b2d12ef08df0f49b686c7667bc8c78cc3e 100644
--- a/Framework/API/inc/MantidAPI/ColumnFactory.h
+++ b/Framework/API/inc/MantidAPI/ColumnFactory.h
@@ -70,7 +70,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<ColumnFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<ColumnFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<ColumnFactoryImpl>
ColumnFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/ConstraintFactory.h b/Framework/API/inc/MantidAPI/ConstraintFactory.h
index aa39886f7937faf8ac3b698e92cbac6494af1834..1d18787c26e464d7da8d7b239ffca391e6a7b44b 100644
--- a/Framework/API/inc/MantidAPI/ConstraintFactory.h
+++ b/Framework/API/inc/MantidAPI/ConstraintFactory.h
@@ -79,7 +79,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<ConstraintFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<ConstraintFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<ConstraintFactoryImpl>
ConstraintFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/CostFunctionFactory.h b/Framework/API/inc/MantidAPI/CostFunctionFactory.h
index c6675f363ff3e0ec93508c499bb8dc162730a6a7..b18865e04061739b206b5a60a9c0fb4fb9b421f4 100644
--- a/Framework/API/inc/MantidAPI/CostFunctionFactory.h
+++ b/Framework/API/inc/MantidAPI/CostFunctionFactory.h
@@ -70,7 +70,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<CostFunctionFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<CostFunctionFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<CostFunctionFactoryImpl>
CostFunctionFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/DomainCreatorFactory.h b/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
index d88d4212241357149a9c0f4fd1416d3bc6197a53..6cb63eaaa718eb83b0b2be00b9d6a89bbf80d4e4 100644
--- a/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
+++ b/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
@@ -76,7 +76,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<DomainCreatorFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<DomainCreatorFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<DomainCreatorFactoryImpl>
DomainCreatorFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/FileFinder.h b/Framework/API/inc/MantidAPI/FileFinder.h
index 7c52f42ca2b71cf1e94a048e5248759ee98eb16b..80956529005ab0a59e0f0d82c033237634d37e2a 100644
--- a/Framework/API/inc/MantidAPI/FileFinder.h
+++ b/Framework/API/inc/MantidAPI/FileFinder.h
@@ -101,7 +101,7 @@ private:
template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<FileFinderImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<FileFinderImpl>
+typedef Mantid::Kernel::SingletonHolder<FileFinderImpl>
FileFinder;
}
}
diff --git a/Framework/API/inc/MantidAPI/FileLoaderRegistry.h b/Framework/API/inc/MantidAPI/FileLoaderRegistry.h
index 02fd7a228b4cdef90a9ad293537fec99db5d1701..18a300ac9f9b46f8cd4cc563b6ef682b7c7394f6 100644
--- a/Framework/API/inc/MantidAPI/FileLoaderRegistry.h
+++ b/Framework/API/inc/MantidAPI/FileLoaderRegistry.h
@@ -154,7 +154,7 @@ template class MANTID_API_DLL
#endif /* _WIN32 */
/// Type for the actual singleton instance
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<FileLoaderRegistryImpl>
+typedef Mantid::Kernel::SingletonHolder<FileLoaderRegistryImpl>
FileLoaderRegistry;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/FrameworkManager.h b/Framework/API/inc/MantidAPI/FrameworkManager.h
index 762e00d14d0a609b92f005c43edfc580bd5ace53..2053bfa975099eb798c8bfba44b0b774b79ac53d 100644
--- a/Framework/API/inc/MantidAPI/FrameworkManager.h
+++ b/Framework/API/inc/MantidAPI/FrameworkManager.h
@@ -142,7 +142,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<FrameworkManagerImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<FrameworkManagerImpl>
+typedef Mantid::Kernel::SingletonHolder<FrameworkManagerImpl>
FrameworkManager;
} // namespace Kernel
diff --git a/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h b/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h
index e8864ac53d08137b19175c0e8ca8186ee1725b2f..850ce1c40d9a092d35e98496d00e7bdc7d2a891a 100644
--- a/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h
+++ b/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h
@@ -68,7 +68,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<FuncMinimizerFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<FuncMinimizerFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<FuncMinimizerFactoryImpl>
FuncMinimizerFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/FunctionFactory.h b/Framework/API/inc/MantidAPI/FunctionFactory.h
index 76a21ecdf0c5dc766f410baab8542f8a9caa8bfd..0b708712df16e5bb63851e2dcfb7480cb37c76ca 100644
--- a/Framework/API/inc/MantidAPI/FunctionFactory.h
+++ b/Framework/API/inc/MantidAPI/FunctionFactory.h
@@ -149,7 +149,7 @@ const std::vector<std::string> &FunctionFactoryImpl::getFunctionNames() const {
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<FunctionFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<FunctionFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<FunctionFactoryImpl>
FunctionFactory;
/// Convenient typedef for an UpdateNotification
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h b/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h
index c0083dc3a6194c20d4fa8d6320391b9f65490a6d..55e0fa2f1933fa8f218732ccb8b033c920f01a2b 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h
@@ -73,7 +73,7 @@ template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<ImplicitFunctionFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
ImplicitFunctionFactoryImpl> ImplicitFunctionFactory;
}
}
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h b/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h
index f7722e5d9f26e890e5e052209443462c51175518..07bfe8243733ba3728232b8586f9bb94bb038dfc 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h
@@ -71,8 +71,7 @@ template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<ImplicitFunctionParameterParserFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL
- Mantid::Kernel::SingletonHolder<ImplicitFunctionParameterParserFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<ImplicitFunctionParameterParserFactoryImpl>
ImplicitFunctionParameterParserFactory;
}
}
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h b/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h
index 703dafa5b12f45384648c96878faede20919f465..8da39a8f65f12d3e5f362c94e21928560173b06f 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h
@@ -75,7 +75,7 @@ template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<ImplicitFunctionParserFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
ImplicitFunctionParserFactoryImpl> ImplicitFunctionParserFactory;
}
}
diff --git a/Framework/API/inc/MantidAPI/InstrumentDataService.h b/Framework/API/inc/MantidAPI/InstrumentDataService.h
index c4d5a2d4cf4bcd7b76da2decbc8c3a7e814664e2..5c7040c63ee28e705e619a65eaf05a99139c480d 100644
--- a/Framework/API/inc/MantidAPI/InstrumentDataService.h
+++ b/Framework/API/inc/MantidAPI/InstrumentDataService.h
@@ -56,7 +56,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<InstrumentDataServiceImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
InstrumentDataServiceImpl> InstrumentDataService;
} // Namespace API
diff --git a/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h b/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
index 814981add0505aa6a3115e8090a960a042cfe54d..8718622b4fe4174da321ea0fcc17211b447923c5 100644
--- a/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
+++ b/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
@@ -95,7 +95,7 @@ template class MANTID_API_DLL
#endif /* _WIN32 */
// The factory is just a specialisation of SingletonHolder
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
RemoteJobManagerFactoryImpl> RemoteJobManagerFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h b/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
index 61886bebd0d30b289042794c6f1478231c745017..e8d098323f353179eb59deeea2924066359f8e18 100644
--- a/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
+++ b/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
@@ -74,7 +74,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<ScriptRepositoryFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
ScriptRepositoryFactoryImpl> ScriptRepositoryFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/TransformScaleFactory.h b/Framework/API/inc/MantidAPI/TransformScaleFactory.h
index e2101893d4c3f0580a41be78dfd6592a97aa2d31..d7913f746537e048f5eef671ce90039ef8aa2882 100644
--- a/Framework/API/inc/MantidAPI/TransformScaleFactory.h
+++ b/Framework/API/inc/MantidAPI/TransformScaleFactory.h
@@ -75,7 +75,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<TransformScaleFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
TransformScaleFactoryImpl> TransformScaleFactory;
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/WorkspaceFactory.h b/Framework/API/inc/MantidAPI/WorkspaceFactory.h
index 503c64c29c62903b5fc9299abebcace8b61453ee..3dc53497f9a1907902c6fd406ee42d6b09d16e86 100644
--- a/Framework/API/inc/MantidAPI/WorkspaceFactory.h
+++ b/Framework/API/inc/MantidAPI/WorkspaceFactory.h
@@ -105,7 +105,7 @@ private:
template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<WorkspaceFactoryImpl>;
#endif /* _WIN32 */
-typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<WorkspaceFactoryImpl>
+typedef Mantid::Kernel::SingletonHolder<WorkspaceFactoryImpl>
WorkspaceFactory;
} // namespace Kernel
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h b/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
index c1ae2f418e7cfb4475ebc570e7fc338b32f2da13..7d350f34c1b4320a35bdae697873a995c29025bd 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
@@ -237,17 +237,17 @@ ParameterType<Type> &ParameterType<Type>::operator=(const Type &value) {
/// Typedef for the shared pointer
typedef boost::shared_ptr<Parameter> Parameter_sptr;
/// Parameter of type int
-typedef MANTID_GEOMETRY_DLL ParameterType<int> ParameterInt;
+typedef ParameterType<int> ParameterInt;
/// Parameter of type double
-typedef MANTID_GEOMETRY_DLL ParameterType<double> ParameterDouble;
+typedef ParameterType<double> ParameterDouble;
/// Parameter of type bool
-typedef MANTID_GEOMETRY_DLL ParameterType<bool> ParameterBool;
+typedef ParameterType<bool> ParameterBool;
/// Parameter of type std::string
-typedef MANTID_GEOMETRY_DLL ParameterType<std::string> ParameterString;
+typedef ParameterType<std::string> ParameterString;
/// Parameter of type V3D
-typedef MANTID_GEOMETRY_DLL ParameterType<Kernel::V3D> ParameterV3D;
+typedef ParameterType<Kernel::V3D> ParameterV3D;
/// Parameter of type Quat
-typedef MANTID_GEOMETRY_DLL ParameterType<Kernel::Quat> ParameterQuat;
+typedef ParameterType<Kernel::Quat> ParameterQuat;
} // namespace Geometry
} // namespace Mantid
diff --git a/Framework/Kernel/inc/MantidKernel/ConfigService.h b/Framework/Kernel/inc/MantidKernel/ConfigService.h
index 2ca272f36d941f01c707b755b31c70477e00a1dc..616f5cb3936dde7cc1edafa47189232820fa9631 100644
--- a/Framework/Kernel/inc/MantidKernel/ConfigService.h
+++ b/Framework/Kernel/inc/MantidKernel/ConfigService.h
@@ -359,7 +359,7 @@ inline
#endif
template class MANTID_KERNEL_DLL
Mantid::Kernel::SingletonHolder<ConfigServiceImpl>;
-typedef MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<ConfigServiceImpl>
+typedef Mantid::Kernel::SingletonHolder<ConfigServiceImpl>
ConfigService;
typedef Mantid::Kernel::ConfigServiceImpl::ValueChanged
diff --git a/Framework/Kernel/inc/MantidKernel/LibraryManager.h b/Framework/Kernel/inc/MantidKernel/LibraryManager.h
index de77712ad2f67da494918a3fed90b18a6acf53b7..089038d0c08851f904935459100d3803d28f2111 100644
--- a/Framework/Kernel/inc/MantidKernel/LibraryManager.h
+++ b/Framework/Kernel/inc/MantidKernel/LibraryManager.h
@@ -76,7 +76,7 @@ inline
#endif
template class MANTID_KERNEL_DLL
Mantid::Kernel::SingletonHolder<LibraryManagerImpl>;
-typedef MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<LibraryManagerImpl>
+typedef Mantid::Kernel::SingletonHolder<LibraryManagerImpl>
LibraryManager;
} // namespace Kernel
diff --git a/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h b/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
index 49aa7c28a21a8cc7db68b04e5bd36083530f0570..46d3d0b9513c6c37b32218248ba4b7c1b089cdfe 100644
--- a/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
@@ -54,7 +54,7 @@ private:
template class MANTID_KERNEL_DLL
Mantid::Kernel::SingletonHolder<PropertyManagerDataServiceImpl>;
#endif /* _WIN32 */
-typedef MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
PropertyManagerDataServiceImpl> PropertyManagerDataService;
} // Namespace Kernel
diff --git a/Framework/Kernel/inc/MantidKernel/ThreadPool.h b/Framework/Kernel/inc/MantidKernel/ThreadPool.h
index c383d334d1b91912243d54c7fa9ea9846f0407ee..256eacf6b68d499d7ed3a6d82b60995e3963c36b 100644
--- a/Framework/Kernel/inc/MantidKernel/ThreadPool.h
+++ b/Framework/Kernel/inc/MantidKernel/ThreadPool.h
@@ -93,7 +93,7 @@ private:
// template class MANTID_KERNEL_DLL
// Mantid::Kernel::SingletonHolder<ThreadPoolImpl>;
//#endif /* _WIN32 */
-// typedef MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<ThreadPoolImpl>
+// typedef Mantid::Kernel::SingletonHolder<ThreadPoolImpl>
// ThreadPool;
} // namespace Kernel
diff --git a/Framework/Kernel/inc/MantidKernel/UsageService.h b/Framework/Kernel/inc/MantidKernel/UsageService.h
index f77ba2d5a15358c189de50eb674cd7ac59d76a18..b3b461118e24e51613f2441d9d4d8a6a493e7962 100644
--- a/Framework/Kernel/inc/MantidKernel/UsageService.h
+++ b/Framework/Kernel/inc/MantidKernel/UsageService.h
@@ -144,7 +144,7 @@ inline
#endif
template class MANTID_KERNEL_DLL
Mantid::Kernel::SingletonHolder<UsageServiceImpl>;
-typedef MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<UsageServiceImpl>
+typedef Mantid::Kernel::SingletonHolder<UsageServiceImpl>
UsageService;
} // namespace API
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h
index 5bb9e80788bd51ee5eaf9c963a97c4494df16fff..04380c802fd8be1840162d37a372e6eda826c646 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h
@@ -72,8 +72,7 @@ template class MANTID_MDALGORITHMS_DLL
Kernel::SingletonHolder<ForegroundModelFactoryImpl>;
#endif /* _WIN32 */
/// Typedef singleton instance to ForegroundFactory
-typedef MANTID_MDALGORITHMS_DLL
- Kernel::SingletonHolder<ForegroundModelFactoryImpl> ForegroundModelFactory;
+typedef Kernel::SingletonHolder<ForegroundModelFactoryImpl> ForegroundModelFactory;
}
}
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h
index 005d9af1314d58cff2318dc97757c62c9421ac9d..2d1b8750ea4b93d0cbd6edf58749a0367b51eab8 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h
@@ -71,7 +71,7 @@ template class MANTID_MDALGORITHMS_DLL
Kernel::SingletonHolder<MDResolutionConvolutionFactoryImpl>;
#endif /* _WIN32 */
/// Typedef singleton instance to MDResolutionConvolutionFactory
-typedef MANTID_MDALGORITHMS_DLL Kernel::SingletonHolder<
+typedef Kernel::SingletonHolder<
MDResolutionConvolutionFactoryImpl> MDResolutionConvolutionFactory;
}
}
diff --git a/MantidQt/API/inc/MantidQtAPI/AlgorithmInputHistory.h b/MantidQt/API/inc/MantidQtAPI/AlgorithmInputHistory.h
index 6add232669d66186d01aae3a4d6b9d79e8de0380..794db1cc8cc5022f303c6820b14252c3727cef78 100644
--- a/MantidQt/API/inc/MantidQtAPI/AlgorithmInputHistory.h
+++ b/MantidQt/API/inc/MantidQtAPI/AlgorithmInputHistory.h
@@ -98,7 +98,7 @@ private:
template class EXPORT_OPT_MANTIDQT_API Mantid::Kernel::SingletonHolder<AlgorithmInputHistoryImpl>;
#endif /* _WIN32 */
/// The specific instantiation of the templated type
- typedef EXPORT_OPT_MANTIDQT_API Mantid::Kernel::SingletonHolder<AlgorithmInputHistoryImpl> AlgorithmInputHistory;
+ typedef Mantid::Kernel::SingletonHolder<AlgorithmInputHistoryImpl> AlgorithmInputHistory;
}
}
diff --git a/MantidQt/API/inc/MantidQtAPI/InterfaceFactory.h b/MantidQt/API/inc/MantidQtAPI/InterfaceFactory.h
index 7fce6d1c919424feff3994a28bb8a4cbe8cf98dd..694792b5f4561aa987a29145ef362062bbcdb996 100644
--- a/MantidQt/API/inc/MantidQtAPI/InterfaceFactory.h
+++ b/MantidQt/API/inc/MantidQtAPI/InterfaceFactory.h
@@ -75,7 +75,7 @@ template class EXPORT_OPT_MANTIDQT_API
Mantid::Kernel::SingletonHolder<AlgorithmDialogFactoryImpl>;
#endif /* _WIN32 */
/// The specific instantiation of the templated type
-typedef EXPORT_OPT_MANTIDQT_API Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
AlgorithmDialogFactoryImpl> AlgorithmDialogFactory;
/**
@@ -190,7 +190,7 @@ template class EXPORT_OPT_MANTIDQT_API
Mantid::Kernel::SingletonHolder<UserSubWindowFactoryImpl>;
#endif /* _WIN32 */
/// The specific instantiation of the templated type
-typedef EXPORT_OPT_MANTIDQT_API Mantid::Kernel::SingletonHolder<
+typedef Mantid::Kernel::SingletonHolder<
UserSubWindowFactoryImpl> UserSubWindowFactory;
}
}
diff --git a/MantidQt/API/inc/MantidQtAPI/SelectionNotificationService.h b/MantidQt/API/inc/MantidQtAPI/SelectionNotificationService.h
index be793d990e5f3f18cf0e8333420a894bfc74e1de..3566bf08d264004fbafd173740ceaa57b823dfa2 100644
--- a/MantidQt/API/inc/MantidQtAPI/SelectionNotificationService.h
+++ b/MantidQt/API/inc/MantidQtAPI/SelectionNotificationService.h
@@ -70,7 +70,7 @@ namespace MantidQt
template class EXPORT_OPT_MANTIDQT_API Mantid::Kernel::SingletonHolder<SelectionNotificationServiceImpl>;
#endif /* _WIN32 */
- typedef EXPORT_OPT_MANTIDQT_API Mantid::Kernel::SingletonHolder<SelectionNotificationServiceImpl> SelectionNotificationService;
+ typedef Mantid::Kernel::SingletonHolder<SelectionNotificationServiceImpl> SelectionNotificationService;
}
}