diff --git a/ogg/flac/oggflacfile.cpp b/ogg/flac/oggflacfile.cpp
index f2f9212d..fe7b0d05 100644
--- a/ogg/flac/oggflacfile.cpp
+++ b/ogg/flac/oggflacfile.cpp
@@ -76,12 +76,12 @@ Ogg::FLAC::File::~File()
   delete d;
 }
 
-TagLib::Tag* Ogg::FLAC::File::tag() const
+Ogg::XiphComment *Ogg::FLAC::File::tag() const
 {
   return d->comment;
 }
 
-Properties* Ogg::FLAC::File::audioProperties() const
+Properties *Ogg::FLAC::File::audioProperties() const
 {
   return d->properties;
 }
diff --git a/ogg/flac/oggflacfile.h b/ogg/flac/oggflacfile.h
index db00dc0b..61138435 100644
--- a/ogg/flac/oggflacfile.h
+++ b/ogg/flac/oggflacfile.h
@@ -73,7 +73,7 @@ namespace TagLib {
       /*!
        * Returns the Tag for this file.  This will always be a XiphComment.
        */
-      virtual TagLib::Tag *tag() const;
+      virtual XiphComment *tag() const;
 
       /*!
        * Returns the FLAC::Properties for this file.  If no audio properties