diff --git a/src/libtomahawk/album.cpp b/src/libtomahawk/album.cpp
index b1489ddc8..417880d5e 100644
--- a/src/libtomahawk/album.cpp
+++ b/src/libtomahawk/album.cpp
@@ -76,10 +76,10 @@ Album::Album( unsigned int id, const QString& name, const Tomahawk::artist_ptr&
     , m_id( id )
     , m_name( name )
     , m_artist( artist )
+    , m_infoLoaded( false )
 #ifndef ENABLE_HEADLESS
     , m_cover( 0 )
 #endif
-    , m_infoLoaded( false )
 {
     connect( Tomahawk::InfoSystem::InfoSystem::instance(),
              SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
diff --git a/src/libtomahawk/album.h b/src/libtomahawk/album.h
index df0b805be..9ecacf900 100644
--- a/src/libtomahawk/album.h
+++ b/src/libtomahawk/album.h
@@ -73,13 +73,13 @@ private:
     QString m_name;
     artist_ptr m_artist;
     QByteArray m_coverBuffer;
-#ifndef ENABLE_HEADLESS
-    mutable QPixmap* m_cover;
-#endif
     bool m_infoLoaded;
     mutable QString m_uuid;
 
+#ifndef ENABLE_HEADLESS
+    mutable QPixmap* m_cover;
     mutable QHash< int, QPixmap > m_coverCache;
+#endif
 
     Tomahawk::playlistinterface_ptr m_playlistInterface;
 };
diff --git a/src/libtomahawk/artist.cpp b/src/libtomahawk/artist.cpp
index 20cb4f116..e90ca835a 100644
--- a/src/libtomahawk/artist.cpp
+++ b/src/libtomahawk/artist.cpp
@@ -75,10 +75,10 @@ Artist::Artist( unsigned int id, const QString& name )
     : QObject()
     , m_id( id )
     , m_name( name )
+    , m_infoLoaded( false )
 #ifndef ENABLE_HEADLESS
     , m_cover( 0 )
 #endif
-    , m_infoLoaded( false )
 {
     m_sortname = DatabaseImpl::sortname( name, true );
 
diff --git a/src/libtomahawk/artist.h b/src/libtomahawk/artist.h
index b99917026..0c656bfa6 100644
--- a/src/libtomahawk/artist.h
+++ b/src/libtomahawk/artist.h
@@ -72,13 +72,13 @@ private:
     QString m_name;
     QString m_sortname;
     QByteArray m_coverBuffer;
-#ifndef ENABLE_HEADLESS
-    mutable QPixmap* m_cover;
-#endif
     bool m_infoLoaded;
     mutable QString m_uuid;
 
+#ifndef ENABLE_HEADLESS
+    mutable QPixmap* m_cover;
     mutable QHash< int, QPixmap > m_coverCache;
+#endif
 
     Tomahawk::playlistinterface_ptr m_playlistInterface;
 };