diff --git a/taglib/flac/flacfile.h b/taglib/flac/flacfile.h
index 67f20ee7..5f37c4f1 100644
--- a/taglib/flac/flacfile.h
+++ b/taglib/flac/flacfile.h
@@ -22,6 +22,7 @@
 #ifndef TAGLIB_FLACFILE_H
 #define TAGLIB_FLACFILE_H
 
+#include "taglib_export.h"
 #include "tfile.h"
 
 #include "flacproperties.h"
@@ -56,7 +57,7 @@ namespace TagLib {
      * information specific to FLAC files.
      */
 
-    class File : public TagLib::File
+    class TAGLIB_EXPORT File : public TagLib::File
     {
     public:
       /*!
diff --git a/taglib/mpc/mpcfile.h b/taglib/mpc/mpcfile.h
index aa40e953..ecbb478a 100644
--- a/taglib/mpc/mpcfile.h
+++ b/taglib/mpc/mpcfile.h
@@ -22,6 +22,7 @@
 #ifndef TAGLIB_MPCFILE_H
 #define TAGLIB_MPCFILE_H
 
+#include "taglib_export.h"
 #include "tfile.h"
 
 #include "mpcproperties.h"
@@ -55,7 +56,7 @@ namespace TagLib {
      * The only invalid tag combination supported is an ID3v1 tag after an APE tag.
      */
 
-    class File : public TagLib::File
+    class TAGLIB_EXPORT File : public TagLib::File
     {
     public:
       /*!
diff --git a/taglib/mpeg/id3v2/id3v2framefactory.h b/taglib/mpeg/id3v2/id3v2framefactory.h
index 81cac97e..c83c358a 100644
--- a/taglib/mpeg/id3v2/id3v2framefactory.h
+++ b/taglib/mpeg/id3v2/id3v2framefactory.h
@@ -22,6 +22,7 @@
 #ifndef TAGLIB_ID3V2FRAMEFACTORY_H
 #define TAGLIB_ID3V2FRAMEFACTORY_H
 
+#include "taglib_export.h"
 #include "tbytevector.h"
 #include "id3v2frame.h"
 
@@ -50,7 +51,7 @@ namespace TagLib {
      * textbooks (Notably <i>Design Patters</i>).
      */
 
-    class FrameFactory
+    class TAGLIB_EXPORT FrameFactory
     {
     public:
       static FrameFactory *instance();
diff --git a/taglib/mpeg/mpegfile.h b/taglib/mpeg/mpegfile.h
index f8c33147..33846845 100644
--- a/taglib/mpeg/mpegfile.h
+++ b/taglib/mpeg/mpegfile.h
@@ -22,6 +22,7 @@
 #ifndef TAGLIB_MPEGFILE_H
 #define TAGLIB_MPEGFILE_H
 
+#include "taglib_export.h"
 #include "tfile.h"
 
 #include "mpegproperties.h"
@@ -44,7 +45,7 @@ namespace TagLib {
      * to the different ID3 tags.
      */
 
-    class File : public TagLib::File
+    class TAGLIB_EXPORT File : public TagLib::File
     {
     public:
       /*!
diff --git a/taglib/ogg/flac/oggflacfile.h b/taglib/ogg/flac/oggflacfile.h
index f1a7452d..24dfe3ed 100644
--- a/taglib/ogg/flac/oggflacfile.h
+++ b/taglib/ogg/flac/oggflacfile.h
@@ -22,6 +22,7 @@
 #ifndef TAGLIB_OGGFLACFILE_H
 #define TAGLIB_OGGFLACFILE_H
 
+#include "taglib_export.h"
 #include "oggfile.h"
 #include "xiphcomment.h"
 
@@ -55,7 +56,7 @@ namespace TagLib {
      * information specific to Ogg FLAC files.
      */
 
-    class File : public Ogg::File
+    class TAGLIB_EXPORT File : public Ogg::File
     {
     public:
       /*!
diff --git a/taglib/ogg/oggfile.h b/taglib/ogg/oggfile.h
index dc7d2248..12879bce 100644
--- a/taglib/ogg/oggfile.h
+++ b/taglib/ogg/oggfile.h
@@ -19,6 +19,7 @@
  *   USA                                                                   *
  ***************************************************************************/
 
+#include "taglib_export.h"
 #include "tfile.h"
 #include "tbytevectorlist.h"
 
@@ -42,7 +43,7 @@ namespace TagLib {
      * these available (via subclassing) to the codec meta data implementations.
      */
 
-    class File : public TagLib::File
+    class TAGLIB_EXPORT File : public TagLib::File
     {
     public:
       virtual ~File();
diff --git a/taglib/ogg/vorbis/vorbisfile.h b/taglib/ogg/vorbis/vorbisfile.h
index 967ae766..e4cdeebb 100644
--- a/taglib/ogg/vorbis/vorbisfile.h
+++ b/taglib/ogg/vorbis/vorbisfile.h
@@ -22,6 +22,7 @@
 #ifndef TAGLIB_VORBISFILE_H
 #define TAGLIB_VORBISFILE_H
 
+#include "taglib_export.h"
 #include "oggfile.h"
 #include "xiphcomment.h"
 
@@ -54,7 +55,7 @@ namespace TagLib {
      * the codec implementations, in this case Vorbis specifically.
      */
 
-    class File : public Ogg::File
+    class TAGLIB_EXPORT File : public Ogg::File
     {
     public:
       /*!
diff --git a/taglib/toolkit/tfile.h b/taglib/toolkit/tfile.h
index 02c87816..cbfc40d3 100644
--- a/taglib/toolkit/tfile.h
+++ b/taglib/toolkit/tfile.h
@@ -22,6 +22,7 @@
 #ifndef TAGLIB_FILE_H
 #define TAGLIB_FILE_H
 
+#include "taglib_export.h"
 #include "taglib.h"
 #include "tbytevector.h"
 
@@ -39,7 +40,7 @@ namespace TagLib {
    * ByteVector and a binary search method for finding patterns in a file.
    */
 
-  class File
+  class TAGLIB_EXPORT File
   {
   public:
     /*!
diff --git a/taglib/toolkit/tstring.h b/taglib/toolkit/tstring.h
index 5bd8a9a0..70e82b1a 100644
--- a/taglib/toolkit/tstring.h
+++ b/taglib/toolkit/tstring.h
@@ -22,6 +22,7 @@
 #ifndef TAGLIB_STRING_H
 #define TAGLIB_STRING_H
 
+#include "taglib_export.h"
 #include "taglib.h"
 #include "tbytevector.h"
 
@@ -60,7 +61,7 @@ namespace TagLib {
    * possible encodings, which are the four supported by the ID3v2 standard.
    */
 
-  class String
+  class TAGLIB_EXPORT String
   {
   public: