diff --git a/taglib/fileref.h b/taglib/fileref.h
index cb4c2b41..db2b7c77 100644
--- a/taglib/fileref.h
+++ b/taglib/fileref.h
@@ -91,6 +91,12 @@ namespace TagLib {
 
     class TAGLIB_EXPORT FileTypeResolver
     {
+#ifdef __GNUC__
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 1)
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+#endif
+
     public:
       // do not fix compiler warning about missing virtual destructor
       // since this would not be binary compatible
diff --git a/taglib/mpeg/id3v1/id3v1tag.h b/taglib/mpeg/id3v1/id3v1tag.h
index 8dc60c3d..c8e4f99f 100644
--- a/taglib/mpeg/id3v1/id3v1tag.h
+++ b/taglib/mpeg/id3v1/id3v1tag.h
@@ -59,6 +59,12 @@ namespace TagLib {
 
     class TAGLIB_EXPORT StringHandler
     {
+#ifdef __GNUC__
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 1)
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+#endif
+
     public:
       // BIC: Add virtual destructor.