diff --git a/taglib/mpeg/id3v2/frames/chapterframe.cpp b/taglib/mpeg/id3v2/frames/chapterframe.cpp
index 99bcb3a0..667abc53 100644
--- a/taglib/mpeg/id3v2/frames/chapterframe.cpp
+++ b/taglib/mpeg/id3v2/frames/chapterframe.cpp
@@ -44,10 +44,10 @@ public:
 
   const ID3v2::Header *tagHeader;
   ByteVector elementID;
-  uint startTime;
-  uint endTime;
-  uint startOffset;
-  uint endOffset;
+  TagLib::uint startTime;
+  TagLib::uint endTime;
+  TagLib::uint startOffset;
+  TagLib::uint endOffset;
   FrameListMap embeddedFrameListMap;
   FrameList embeddedFrameList;
 };
@@ -64,8 +64,8 @@ ChapterFrame::ChapterFrame(const ID3v2::Header *tagHeader, const ByteVector &dat
   setData(data);
 }
 
-ChapterFrame::ChapterFrame(const ByteVector &eID, const uint &sT, const uint &eT,
-                           const uint &sO, const uint &eO, const FrameList &eF) :
+ChapterFrame::ChapterFrame(const ByteVector &eID, const TagLib::uint &sT, const TagLib::uint &eT,
+                           const TagLib::uint &sO, const TagLib::uint &eO, const FrameList &eF) :
     ID3v2::Frame("CHAP")
 {
   d = new ChapterFramePrivate;
@@ -89,22 +89,22 @@ ByteVector ChapterFrame::elementID() const
   return d->elementID;
 }
 
-uint ChapterFrame::startTime() const
+TagLib::uint ChapterFrame::startTime() const
 {
   return d->startTime;
 }
 
-uint ChapterFrame::endTime() const
+TagLib::uint ChapterFrame::endTime() const
 {
   return d->endTime;
 }
 
-uint ChapterFrame::startOffset() const
+TagLib::uint ChapterFrame::startOffset() const
 {
   return d->startOffset;
 }
 
-uint ChapterFrame::endOffset() const
+TagLib::uint ChapterFrame::endOffset() const
 {
   return d->endOffset;
 }
@@ -116,22 +116,22 @@ void ChapterFrame::setElementID(const ByteVector &eID)
     d->elementID.append(char(0));
 }
 
-void ChapterFrame::setStartTime(const uint &sT)
+void ChapterFrame::setStartTime(const TagLib::uint &sT)
 {
   d->startTime = sT;
 }
 
-void ChapterFrame::setEndTime(const uint &eT)
+void ChapterFrame::setEndTime(const TagLib::uint &eT)
 {
   d->endTime = eT;
 }
 
-void ChapterFrame::setStartOffset(const uint &sO)
+void ChapterFrame::setStartOffset(const TagLib::uint &sO)
 {
   d->startOffset = sO;
 }
 
-void ChapterFrame::setEndOffset(const uint &eO)
+void ChapterFrame::setEndOffset(const TagLib::uint &eO)
 {
   d->endOffset = eO;
 }
@@ -211,7 +211,7 @@ ChapterFrame *ChapterFrame::findByElementID(const ID3v2::Tag *tag, const ByteVec
 
 void ChapterFrame::parseFields(const ByteVector &data)
 {
-  uint size = data.size();
+  TagLib::uint size = data.size();
   if(size < 18) {
     debug("A CHAP frame must contain at least 18 bytes (1 byte element ID "
           "terminated by null and 4x4 bytes for start and end time and offset).");
diff --git a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
index 7b6bb9f1..b7d6dad9 100644
--- a/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
+++ b/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
@@ -94,7 +94,7 @@ bool TableOfContentsFrame::isOrdered() const
   return d->isOrdered;
 }
 
-uint TableOfContentsFrame::entryCount() const
+TagLib::uint TableOfContentsFrame::entryCount() const
 {
   return d->childElements.size();
 }
@@ -229,7 +229,7 @@ TableOfContentsFrame *TableOfContentsFrame::findTopLevel(const ID3v2::Tag *tag)
 
 void TableOfContentsFrame::parseFields(const ByteVector &data)
 {
-  uint size = data.size();
+  TagLib::uint size = data.size();
   if(size < 6) {
     debug("A CTOC frame must contain at least 6 bytes (1 byte element ID terminated by "
           "null, 1 byte flags, 1 byte entry count and 1 byte child element ID terminated "
@@ -242,8 +242,8 @@ void TableOfContentsFrame::parseFields(const ByteVector &data)
   d->elementID.append(char(0));
   d->isTopLevel = (data.at(pos) & 2) > 0;
   d->isOrdered = (data.at(pos++) & 1) > 0;
-  uint entryCount = data.at(pos++);
-  for(uint i = 0; i < entryCount; i++)
+  TagLib::uint entryCount = data.at(pos++);
+  for(TagLib::uint i = 0; i < entryCount; i++)
   {
     ByteVector childElementID = readStringField(data, String::Latin1, &pos).data(String::Latin1);
     childElementID.append(char(0));