diff --git a/src/libtomahawk/filemetadata/MetadataEditor.cpp b/src/libtomahawk/filemetadata/MetadataEditor.cpp
index ec784fb9a..c8356a15f 100644
--- a/src/libtomahawk/filemetadata/MetadataEditor.cpp
+++ b/src/libtomahawk/filemetadata/MetadataEditor.cpp
@@ -90,11 +90,11 @@ MetadataEditor::writeMetadata( bool closeDlg )
         QFileInfo fi( QUrl( m_result->url() ).toLocalFile() );
 
         bool changed = false;
-#ifdef COMPLEX_TAGLIB_FILENAME
-        const wchar_t *encodedName = fi.canonicalFilePath().toStdWString().c_str();
+#ifdef Q_OS_WIN
+        const wchar_t* encodedName = fi.canonicalFilePath().toStdWString().c_str();
 #else
         QByteArray fileName = QFile::encodeName( fi.canonicalFilePath() );
-        const char *encodedName = fileName.constData();
+        const char* encodedName = fileName.constData();
 #endif
 
         TagLib::FileRef f( encodedName );
diff --git a/src/libtomahawk/filemetadata/MusicScanner.cpp b/src/libtomahawk/filemetadata/MusicScanner.cpp
index 5e50911b2..eaed4907d 100644
--- a/src/libtomahawk/filemetadata/MusicScanner.cpp
+++ b/src/libtomahawk/filemetadata/MusicScanner.cpp
@@ -386,11 +386,11 @@ MusicScanner::readTags( const QFileInfo& fi )
     if ( !TomahawkUtils::supportedExtensions().contains( suffix ) )
         return QVariantMap(); // invalid extension
 
-    #ifdef COMPLEX_TAGLIB_FILENAME
-        const wchar_t *encodedName = fi.canonicalFilePath().toStdWString().c_str();
+    #ifdef Q_OS_WIN
+        const wchar_t* encodedName = fi.canonicalFilePath().toStdWString().c_str();
     #else
         QByteArray fileName = QFile::encodeName( fi.canonicalFilePath() );
-        const char *encodedName = fileName.constData();
+        const char* encodedName = fileName.constData();
     #endif
 
     TagLib::FileRef f( encodedName );