diff --git a/src/Magnum/Audio/AbstractImporter.cpp b/src/Magnum/Audio/AbstractImporter.cpp
index 6b2e19d40..040c9c2cb 100644
--- a/src/Magnum/Audio/AbstractImporter.cpp
+++ b/src/Magnum/Audio/AbstractImporter.cpp
@@ -42,15 +42,7 @@
 
 namespace Corrade { namespace PluginManager {
 
-/* On non-MinGW Windows the instantiations are already marked with extern
-   template. However Clang-CL doesn't propagate the export from the extern
-   template, it seems. */
-#if !defined(CORRADE_TARGET_WINDOWS) || defined(CORRADE_TARGET_MINGW) || defined(CORRADE_TARGET_CLANG_CL)
-#define MAGNUM_AUDIO_EXPORT_HPP MAGNUM_AUDIO_EXPORT
-#else
-#define MAGNUM_AUDIO_EXPORT_HPP
-#endif
-template class MAGNUM_AUDIO_EXPORT_HPP Manager<Magnum::Audio::AbstractImporter>;
+template class MAGNUM_AUDIO_EXPORT Manager<Magnum::Audio::AbstractImporter>;
 
 }}
 
diff --git a/src/Magnum/ShaderTools/AbstractConverter.cpp b/src/Magnum/ShaderTools/AbstractConverter.cpp
index 54b527bd9..4d3a9596e 100644
--- a/src/Magnum/ShaderTools/AbstractConverter.cpp
+++ b/src/Magnum/ShaderTools/AbstractConverter.cpp
@@ -43,15 +43,7 @@
 
 namespace Corrade { namespace PluginManager {
 
-/* On non-MinGW Windows the instantiations are already marked with extern
-   template. However Clang-CL doesn't propagate the export from the extern
-   template, it seems. */
-#if !defined(CORRADE_TARGET_WINDOWS) || defined(CORRADE_TARGET_MINGW) || defined(CORRADE_TARGET_CLANG_CL)
-#define MAGNUM_SHADERTOOLS_EXPORT_HPP MAGNUM_SHADERTOOLS_EXPORT
-#else
-#define MAGNUM_SHADERTOOLS_EXPORT_HPP
-#endif
-template class MAGNUM_SHADERTOOLS_EXPORT_HPP Manager<Magnum::ShaderTools::AbstractConverter>;
+template class MAGNUM_SHADERTOOLS_EXPORT Manager<Magnum::ShaderTools::AbstractConverter>;
 
 }}
 
diff --git a/src/Magnum/Text/AbstractFont.cpp b/src/Magnum/Text/AbstractFont.cpp
index 44d989e0c..b88755173 100644
--- a/src/Magnum/Text/AbstractFont.cpp
+++ b/src/Magnum/Text/AbstractFont.cpp
@@ -45,15 +45,7 @@
 
 namespace Corrade { namespace PluginManager {
 
-/* On non-MinGW Windows the instantiations are already marked with extern
-   template. However Clang-CL doesn't propagate the export from the extern
-   template, it seems. */
-#if !defined(CORRADE_TARGET_WINDOWS) || defined(CORRADE_TARGET_MINGW) || defined(CORRADE_TARGET_CLANG_CL)
-#define MAGNUM_TEXT_EXPORT_HPP MAGNUM_TEXT_EXPORT
-#else
-#define MAGNUM_TEXT_EXPORT_HPP
-#endif
-template class MAGNUM_TEXT_EXPORT_HPP Manager<Magnum::Text::AbstractFont>;
+template class MAGNUM_TEXT_EXPORT Manager<Magnum::Text::AbstractFont>;
 
 }}
 
diff --git a/src/Magnum/Text/AbstractFontConverter.cpp b/src/Magnum/Text/AbstractFontConverter.cpp
index 1957f3160..02058ee2c 100644
--- a/src/Magnum/Text/AbstractFontConverter.cpp
+++ b/src/Magnum/Text/AbstractFontConverter.cpp
@@ -45,15 +45,7 @@
 
 namespace Corrade { namespace PluginManager {
 
-/* On non-MinGW Windows the instantiations are already marked with extern
-   template. However Clang-CL doesn't propagate the export from the extern
-   template, it seems. */
-#if !defined(CORRADE_TARGET_WINDOWS) || defined(CORRADE_TARGET_MINGW) || defined(CORRADE_TARGET_CLANG_CL)
-#define MAGNUM_TEXT_EXPORT_HPP MAGNUM_TEXT_EXPORT
-#else
-#define MAGNUM_TEXT_EXPORT_HPP
-#endif
-template class MAGNUM_TEXT_EXPORT_HPP Manager<Magnum::Text::AbstractFontConverter>;
+template class MAGNUM_TEXT_EXPORT Manager<Magnum::Text::AbstractFontConverter>;
 
 }}
 
diff --git a/src/Magnum/Trade/AbstractImageConverter.cpp b/src/Magnum/Trade/AbstractImageConverter.cpp
index e21af8147..ffc82cbf3 100644
--- a/src/Magnum/Trade/AbstractImageConverter.cpp
+++ b/src/Magnum/Trade/AbstractImageConverter.cpp
@@ -46,15 +46,7 @@
 
 namespace Corrade { namespace PluginManager {
 
-/* On non-MinGW Windows the instantiations are already marked with extern
-   template. However Clang-CL doesn't propagate the export from the extern
-   template, it seems. */
-#if !defined(CORRADE_TARGET_WINDOWS) || defined(CORRADE_TARGET_MINGW) || defined(CORRADE_TARGET_CLANG_CL)
-#define MAGNUM_TRADE_EXPORT_HPP MAGNUM_TRADE_EXPORT
-#else
-#define MAGNUM_TRADE_EXPORT_HPP
-#endif
-template class MAGNUM_TRADE_EXPORT_HPP Manager<Magnum::Trade::AbstractImageConverter>;
+template class MAGNUM_TRADE_EXPORT Manager<Magnum::Trade::AbstractImageConverter>;
 
 }}
 
diff --git a/src/Magnum/Trade/AbstractImporter.cpp b/src/Magnum/Trade/AbstractImporter.cpp
index f8831e1e1..f5d012d3c 100644
--- a/src/Magnum/Trade/AbstractImporter.cpp
+++ b/src/Magnum/Trade/AbstractImporter.cpp
@@ -72,15 +72,7 @@
 
 namespace Corrade { namespace PluginManager {
 
-/* On non-MinGW Windows the instantiations are already marked with extern
-   template. However Clang-CL doesn't propagate the export from the extern
-   template, it seems. */
-#if !defined(CORRADE_TARGET_WINDOWS) || defined(CORRADE_TARGET_MINGW) || defined(CORRADE_TARGET_CLANG_CL)
-#define MAGNUM_TRADE_EXPORT_HPP MAGNUM_TRADE_EXPORT
-#else
-#define MAGNUM_TRADE_EXPORT_HPP
-#endif
-template class MAGNUM_TRADE_EXPORT_HPP Manager<Magnum::Trade::AbstractImporter>;
+template class MAGNUM_TRADE_EXPORT Manager<Magnum::Trade::AbstractImporter>;
 
 }}
 
diff --git a/src/Magnum/Trade/AbstractSceneConverter.cpp b/src/Magnum/Trade/AbstractSceneConverter.cpp
index 309ab7807..b72541173 100644
--- a/src/Magnum/Trade/AbstractSceneConverter.cpp
+++ b/src/Magnum/Trade/AbstractSceneConverter.cpp
@@ -46,15 +46,7 @@
 
 namespace Corrade { namespace PluginManager {
 
-/* On non-MinGW Windows the instantiations are already marked with extern
-   template. However Clang-CL doesn't propagate the export from the extern
-   template, it seems. */
-#if !defined(CORRADE_TARGET_WINDOWS) || defined(CORRADE_TARGET_MINGW) || defined(CORRADE_TARGET_CLANG_CL)
-#define MAGNUM_TRADE_EXPORT_HPP MAGNUM_TRADE_EXPORT
-#else
-#define MAGNUM_TRADE_EXPORT_HPP
-#endif
-template class MAGNUM_TRADE_EXPORT_HPP Manager<Magnum::Trade::AbstractSceneConverter>;
+template class MAGNUM_TRADE_EXPORT Manager<Magnum::Trade::AbstractSceneConverter>;
 
 }}