diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
index 507a24d3..f6a4aac9 100644
--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
@@ -290,7 +290,7 @@ Frame *FrameFactory::createFrame(const ByteVector &origData, Header *tagHeader)
   return new UnknownFrame(data, header);
 }
 
-void FrameFactory::rebuildAggregateFrames(Tag *tag) const
+void FrameFactory::rebuildAggregateFrames(ID3v2::Tag *tag) const
 {
   if(tag->header()->majorVersion() < 4 &&
      tag->frameList("TDRC").size() == 1 &&
diff --git a/taglib/mpeg/id3v2/id3v2framefactory.h b/taglib/mpeg/id3v2/id3v2framefactory.h
index d991fb2b..d5dcec32 100644
--- a/taglib/mpeg/id3v2/id3v2framefactory.h
+++ b/taglib/mpeg/id3v2/id3v2framefactory.h
@@ -99,7 +99,7 @@ namespace TagLib {
        * have been deprecated and can't be upgraded directly.
        */
       // BIC: Make virtual
-      void rebuildAggregateFrames(Tag *tag) const;
+      void rebuildAggregateFrames(ID3v2::Tag *tag) const;
 
       /*!
        * Returns the default text encoding for text frames.  If setTextEncoding()