diff --git a/taglib/fileref.cpp b/taglib/fileref.cpp
index 56726ecd..65a546db 100644
--- a/taglib/fileref.cpp
+++ b/taglib/fileref.cpp
@@ -68,8 +68,7 @@ class FileRef::StreamTypeResolver::StreamTypeResolverPrivate
 
 namespace
 {
-  typedef List<const FileRef::FileTypeResolver *> ResolverList;
-  ResolverList fileTypeResolvers;
+  List<const FileRef::FileTypeResolver *> fileTypeResolvers;
 
   // Detect the file type by user-defined resolvers.
 
diff --git a/taglib/flac/flacfile.cpp b/taglib/flac/flacfile.cpp
index 0350477d..b71c3a4b 100644
--- a/taglib/flac/flacfile.cpp
+++ b/taglib/flac/flacfile.cpp
@@ -48,10 +48,6 @@ using namespace TagLib;
 
 namespace
 {
-  typedef List<FLAC::MetadataBlock *> BlockList;
-  typedef BlockList::Iterator BlockIterator;
-  typedef BlockList::ConstIterator BlockConstIterator;
-
   enum { FlacXiphIndex = 0, FlacID3v2Index = 1, FlacID3v1Index = 2 };
 
   const long MinPaddingLength = 4096;
@@ -87,7 +83,7 @@ public:
 
   Properties *properties { nullptr };
   ByteVector xiphCommentData;
-  BlockList blocks;
+  List<FLAC::MetadataBlock *> blocks;
 
   offset_t flacStart { 0 };
   offset_t streamStart { 0 };
diff --git a/taglib/ogg/xiphcomment.cpp b/taglib/ogg/xiphcomment.cpp
index cbba1f82..d1ea5a82 100644
--- a/taglib/ogg/xiphcomment.cpp
+++ b/taglib/ogg/xiphcomment.cpp
@@ -35,16 +35,6 @@
 
 using namespace TagLib;
 
-namespace
-{
-  typedef Ogg::FieldListMap::Iterator FieldIterator;
-  typedef Ogg::FieldListMap::ConstIterator FieldConstIterator;
-
-  typedef List<FLAC::Picture *> PictureList;
-  typedef PictureList::Iterator PictureIterator;
-  typedef PictureList::ConstIterator PictureConstIterator;
-} // namespace
-
 class Ogg::XiphComment::XiphCommentPrivate
 {
 public:
@@ -56,7 +46,7 @@ public:
   FieldListMap fieldListMap;
   String vendorID;
   String commentField;
-  PictureList pictureList;
+  List<FLAC::Picture *> pictureList;
 };
 
 ////////////////////////////////////////////////////////////////////////////////