diff --git a/src/BufferImage.cpp b/src/BufferImage.cpp
index db8d13069..b29c10e43 100644
--- a/src/BufferImage.cpp
+++ b/src/BufferImage.cpp
@@ -34,9 +34,9 @@ template<UnsignedInt dimensions> void BufferImage<dimensions>::setData(const typ
     _buffer.setData(pixelSize(format, type)*size.product(), data, usage);
 }
 
-template class BufferImage<1>;
-template class BufferImage<2>;
-template class BufferImage<3>;
+template class MAGNUM_EXPORT BufferImage<1>;
+template class MAGNUM_EXPORT BufferImage<2>;
+template class MAGNUM_EXPORT BufferImage<3>;
 #endif
 
 }
diff --git a/src/Image.cpp b/src/Image.cpp
index a1c67a30a..92f740b5c 100644
--- a/src/Image.cpp
+++ b/src/Image.cpp
@@ -34,8 +34,8 @@ template<UnsignedInt dimensions> void Image<dimensions>::setData(const typename
     _data = reinterpret_cast<unsigned char*>(data);
 }
 
-template class Image<1>;
-template class Image<2>;
-template class Image<3>;
+template class MAGNUM_EXPORT Image<1>;
+template class MAGNUM_EXPORT Image<2>;
+template class MAGNUM_EXPORT Image<3>;
 
 }
diff --git a/src/Image.h b/src/Image.h
index f0de0ad67..8c1649b9d 100644
--- a/src/Image.h
+++ b/src/Image.h
@@ -94,12 +94,6 @@ template<UnsignedInt dimensions> class Image: public AbstractImage {
         unsigned char* _data;
 };
 
-#ifndef DOXYGEN_GENERATING_OUTPUT
-extern template class MAGNUM_EXPORT Image<1>;
-extern template class MAGNUM_EXPORT Image<2>;
-extern template class MAGNUM_EXPORT Image<3>;
-#endif
-
 /** @brief One-dimensional image */
 typedef Image<1> Image1D;