diff --git a/taglib/mpeg/id3v1/id3v1tag.cpp b/taglib/mpeg/id3v1/id3v1tag.cpp
index d1d538ef..23c048ed 100644
--- a/taglib/mpeg/id3v1/id3v1tag.cpp
+++ b/taglib/mpeg/id3v1/id3v1tag.cpp
@@ -220,7 +220,7 @@ void ID3v1::Tag::setStringHandler(const TagLib::StringHandler *handler)
 // protected methods
 ////////////////////////////////////////////////////////////////////////////////
 
-void ID3v1::Tag::read(File *file, long tagOffset)
+void ID3v1::Tag::read(File *file, long long tagOffset)
 {
   if(file && file->isValid()) {
     file->seek(tagOffset);
diff --git a/taglib/mpeg/id3v1/id3v1tag.h b/taglib/mpeg/id3v1/id3v1tag.h
index fb24b468..a917dbf9 100644
--- a/taglib/mpeg/id3v1/id3v1tag.h
+++ b/taglib/mpeg/id3v1/id3v1tag.h
@@ -140,7 +140,7 @@ namespace TagLib {
       /*!
        * Reads from the file specified in the constructor.
        */
-      void read(File *file, long tagOffset);
+      void read(File *file, long long tagOffset);
       /*!
        * Pareses the body of the tag in \a data.
        */
diff --git a/taglib/mpeg/id3v2/id3v2tag.cpp b/taglib/mpeg/id3v2/id3v2tag.cpp
index 786d7d25..008d5a43 100644
--- a/taglib/mpeg/id3v2/id3v2tag.cpp
+++ b/taglib/mpeg/id3v2/id3v2tag.cpp
@@ -840,7 +840,7 @@ void ID3v2::Tag::setLatin1StringHandler(const TagLib::StringHandler *handler)
 // protected members
 ////////////////////////////////////////////////////////////////////////////////
 
-void ID3v2::Tag::read(TagLib::File *file, long offset)
+void ID3v2::Tag::read(TagLib::File *file, long long offset)
 {
   if(!file)
     return;
diff --git a/taglib/mpeg/id3v2/id3v2tag.h b/taglib/mpeg/id3v2/id3v2tag.h
index bdc0f3c9..a207c6d5 100644
--- a/taglib/mpeg/id3v2/id3v2tag.h
+++ b/taglib/mpeg/id3v2/id3v2tag.h
@@ -356,7 +356,7 @@ namespace TagLib {
        * the Header, the body of the tag  (which contains the ExtendedHeader and
        * frames) and Footer.
        */
-      void read(TagLib::File *file, long offset);
+      void read(TagLib::File *file, long long offset);
 
       /*!
        * This is called by read to parse the body of the tag.  It determines if an
diff --git a/taglib/riff/rifffile.cpp b/taglib/riff/rifffile.cpp
index d6e583d3..b2add557 100644
--- a/taglib/riff/rifffile.cpp
+++ b/taglib/riff/rifffile.cpp
@@ -70,20 +70,6 @@ RIFF::File::~File()
   delete d;
 }
 
-bool RIFF::File::isValidChunkName(const ByteVector &name)   // static
-{
-  if(name.size() != 4)
-    return false;
-
-  for(ByteVector::ConstIterator it = name.begin(); it != name.end(); ++it) {
-    const uchar c = static_cast<uchar>(*it);
-    if(c < 32 || 127 < c)
-      return false;
-  }
-
-  return true;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // protected members
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/taglib/riff/rifffile.h b/taglib/riff/rifffile.h
index db4390dc..d07e1bc3 100644
--- a/taglib/riff/rifffile.h
+++ b/taglib/riff/rifffile.h
@@ -51,13 +51,7 @@ namespace TagLib {
        */
       virtual ~File();
 
-      /*!
-       * Returns whether or not \a name is valid as a chunk name.
-       */
-      static bool isValidChunkName(const ByteVector &name);
-
     protected:
-
       File(FileName file, ByteOrder endianness);
       File(IOStream *stream, ByteOrder endianness);