diff --git a/src/libtomahawk/filemetadata/MusicScanner.cpp b/src/libtomahawk/filemetadata/MusicScanner.cpp
index 01ef0b66d..408f91f33 100644
--- a/src/libtomahawk/filemetadata/MusicScanner.cpp
+++ b/src/libtomahawk/filemetadata/MusicScanner.cpp
@@ -142,8 +142,10 @@ MusicScanner::MusicScanner( MusicScanner::ScanMode scanMode, const QStringList&
     m_ext2mime.insert( "mp3",  TomahawkUtils::extensionToMimetype( "mp3" ) );
     m_ext2mime.insert( "ogg",  TomahawkUtils::extensionToMimetype( "ogg" ) );
     m_ext2mime.insert( "oga",  TomahawkUtils::extensionToMimetype( "oga" ) );
+#if defined(TAGLIB_MAJOR_VERSION) && defined(TAGLIB_MINOR_VERSION)
 #if TAGLIB_MAJOR_VERSION >= 1 && TAGLIB_MINOR_VERSION >= 9
     m_ext2mime.insert( "opus",  TomahawkUtils::extensionToMimetype( "opus" ) );
+#endif
 #endif
     m_ext2mime.insert( "mpc",  TomahawkUtils::extensionToMimetype( "mpc" ) );
     m_ext2mime.insert( "wma",  TomahawkUtils::extensionToMimetype( "wma" ) );
diff --git a/src/libtomahawk/filemetadata/taghandlers/tag.cpp b/src/libtomahawk/filemetadata/taghandlers/tag.cpp
index 048ff3531..b9a2c98d1 100644
--- a/src/libtomahawk/filemetadata/taghandlers/tag.cpp
+++ b/src/libtomahawk/filemetadata/taghandlers/tag.cpp
@@ -28,8 +28,10 @@
 #include <taglib/xiphcomment.h>
 #include <taglib/vorbisfile.h>
 #include <taglib/oggflacfile.h>
-#if TAGLIB_MAJOR_VERSION >= 1 && TAGLIB_MINOR_VERSION >= 9
-    #include <taglib/opusfile.h>
+#if defined(TAGLIB_MAJOR_VERSION) && defined(TAGLIB_MINOR_VERSION)
+    #if TAGLIB_MAJOR_VERSION >= 1 && TAGLIB_MINOR_VERSION >= 9
+        #include <taglib/opusfile.h>
+    #endif
 #endif
 #include <taglib/flacfile.h>
 #include <taglib/speexfile.h>
diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp
index 1cd3e031d..b3f83a1a7 100644
--- a/src/libtomahawk/utils/TomahawkUtils.cpp
+++ b/src/libtomahawk/utils/TomahawkUtils.cpp
@@ -38,6 +38,9 @@
 #include <quazip/quazip.h>
 #include <quazip/quazipfile.h>
 
+// We need this for the version info (if available)
+#include <taglib/taglib.h>
+
 #include <QNetworkConfiguration>
 #include <QNetworkAccessManager>
 #include <QNetworkProxy>
@@ -322,8 +325,10 @@ extensionToMimetype( const QString& extension )
         s_ext2mime.insert( "mp3",  "audio/mpeg" );
         s_ext2mime.insert( "ogg",  "application/ogg" );
         s_ext2mime.insert( "oga",  "application/ogg" );
+#if defined(TAGLIB_MAJOR_VERSION) && defined(TAGLIB_MINOR_VERSION)
 #if TAGLIB_MAJOR_VERSION >= 1 && TAGLIB_MINOR_VERSION >= 9
         s_ext2mime.insert( "opus",  "application/opus" );
+#endif
 #endif
         s_ext2mime.insert( "mpc",  "audio/x-musepack" );
         s_ext2mime.insert( "wma",  "audio/x-ms-wma" );