* A 'little' spring cleaning. Or at least that's what it feels like. Exhausted.

src/audiocontrols.h

@@ -29,6 +29,7 @@
 class QDropEvent;
 class QDragEnterEvent;
 class QDragMoveEvent;
+
 namespace Ui
 {
     class AudioControls;

src/libtomahawk/album.cpp

@@ -18,9 +18,11 @@
 
 #include "album.h"
 
-#include "collection.h"
+#include "artist.h"
 #include "database/database.h"
+#include "database/databaseimpl.h"
 #include "database/databasecommand_alltracks.h"
+#include "query.h"
 
 #include "utils/logger.h"
 

src/libtomahawk/album.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -23,10 +23,7 @@
 #include <QSharedPointer>
 
 #include "typedefs.h"
-#include "artist.h"
-#include "collection.h"
 #include "playlistinterface.h"
-
 #include "dllmacro.h"
 
 namespace Tomahawk
@@ -71,7 +68,7 @@ signals:
     void tracksAdded( const QList<Tomahawk::query_ptr>& tracks );
     void trackCountChanged( unsigned int tracks );
     void sourceTrackCountChanged( unsigned int tracks );
-    
+
     void nextTrackReady();
 
 private slots:

src/libtomahawk/artist.cpp

@@ -20,7 +20,9 @@
 
 #include "collection.h"
 #include "database/database.h"
+#include "database/databaseimpl.h"
 #include "database/databasecommand_alltracks.h"
+#include "query.h"
 
 #include "utils/logger.h"
 

src/libtomahawk/artist.h

@@ -23,9 +23,7 @@
 #include <QSharedPointer>
 
 #include "typedefs.h"
-
 #include "playlistinterface.h"
-
 #include "dllmacro.h"
 
 namespace Tomahawk

src/libtomahawk/collection.cpp

@@ -21,8 +21,7 @@
 #include <QMetaObject>
 #include <QGenericArgument>
 
-#include "dynamic/DynamicPlaylist.h"
-#include "playlist.h"
+#include "source.h"
 
 #include "utils/logger.h"
 

src/libtomahawk/collection.h

@@ -31,10 +31,9 @@
 #include <QList>
 #include <QSharedPointer>
 
+#include "typedefs.h"
 #include "functimeout.h"
 #include "playlist.h"
-#include "source.h"
-#include "typedefs.h"
 #include "playlist/dynamic/DynamicPlaylist.h"
 
 #include "dllmacro.h"

src/libtomahawk/context/ContextPage.cpp

@@ -20,6 +20,9 @@
 
 #include <QGraphicsLinearLayout>
 
+#include "playlistinterface.h"
+#include "utils/stylehelper.h"
+
 using namespace Tomahawk;
 
 

src/libtomahawk/context/ContextPage.h

@@ -24,13 +24,13 @@
 #include <QStyleOptionGraphicsItem>
 
 #include "typedefs.h"
-#include "playlistinterface.h"
-#include "utils/stylehelper.h"
 #include "utils/tomahawkutils.h"
 
 #include "dllmacro.h"
 #include <signal.h>
 
+class PlaylistInterface;
+
 namespace Tomahawk
 {
 

src/libtomahawk/context/ContextWidget.cpp

@@ -32,6 +32,8 @@
 #include "playlist/artistview.h"
 #include "playlist/treemodel.h"
 
+#include "utils/stylehelper.h"
+
 #define ANIMATION_TIME 450
 #define SLIDE_TIME 350
 

src/libtomahawk/contextmenu.h

@@ -23,8 +23,6 @@
 #include <QMenu>
 
 #include "typedefs.h"
-#include "album.h"
-#include "artist.h"
 #include "dllmacro.h"
 
 namespace Tomahawk

src/libtomahawk/database/database.cpp

@@ -18,6 +18,9 @@
 
 #include "database.h"
 
+#include "databasecommand.h"
+#include "databaseimpl.h"
+#include "databaseworker.h"
 #include "utils/logger.h"
 
 #define DEFAULT_WORKER_THREADS 4

src/libtomahawk/database/database.h

@@ -22,12 +22,15 @@
 #include <QSharedPointer>
 #include <QVariant>
 
-#include "database/databaseimpl.h"
-#include "database/databasecommand.h"
-#include "database/databaseworker.h"
+#include "artist.h"
+#include "album.h"
 
 #include "dllmacro.h"
 
+class DatabaseCommand;
+class DatabaseImpl;
+class DatabaseWorker;
+
 /*
     This class is really a firewall/pimpl - the public functions of LibraryImpl
     are the ones that operate on the database, without any locks.

src/libtomahawk/database/databasecommand.h

@@ -107,6 +107,4 @@ private:
 
 Q_DECLARE_METATYPE( DatabaseCommand )
 
-#include "source.h"
-
 #endif // DATABASECOMMAND_H

src/libtomahawk/database/databasecommand_addclientauth.cpp

@@ -18,6 +18,8 @@
 
 #include "databasecommand_addclientauth.h"
 
+#include "databaseimpl.h"
+#include "tomahawksqlquery.h"
 #include "utils/logger.h"
 
 

src/libtomahawk/database/databasecommand_addclientauth.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -19,12 +19,13 @@
 #ifndef DATABASECOMMAND_ADDCLIENTAUTH_H
 #define DATABASECOMMAND_ADDCLIENTAUTH_H
 
-#include "databaseimpl.h"
 #include "databasecommand.h"
 #include "dllmacro.h"
 
 #include <QObject>
 
+class DatabaseImpl;
+
 class DLLEXPORT DatabaseCommand_AddClientAuth : public DatabaseCommand
 {
     Q_OBJECT
@@ -39,7 +40,7 @@ public:
 
     virtual void exec( DatabaseImpl* lib );
     virtual bool doesMutates() const { return true; }
-    
+
 private:
     QString m_clientToken, m_website, m_name, m_userAgent;
 };

src/libtomahawk/database/databasecommand_addfiles.cpp

@@ -26,7 +26,8 @@
 #include "database/database.h"
 #include "databasecommand_collectionstats.h"
 #include "databaseimpl.h"
-#include "network/controlconnection.h"
+#include "network/dbsyncconnection.h"
+#include "network/servent.h"
 #include "sourcelist.h"
 
 #include "utils/logger.h"

src/libtomahawk/database/databasecommand_addsource.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -35,6 +35,7 @@ public:
     virtual void exec( DatabaseImpl* lib );
     virtual bool doesMutates() const { return true; }
     virtual QString commandname() const { return "addsource"; }
+
 signals:
     void done( unsigned int, const QString& );
 

src/libtomahawk/database/databasecommand_allalbums.cpp

@@ -20,7 +20,9 @@
 
 #include <QSqlQuery>
 
+#include "artist.h"
 #include "databaseimpl.h"
+#include "source.h"
 #include "utils/tomahawkutils.h"
 #include "utils/logger.h"
 

src/libtomahawk/database/databasecommand_allalbums.h

@@ -22,10 +22,9 @@
 #include <QObject>
 #include <QVariantMap>
 
+#include "typedefs.h"
 #include "databasecommand.h"
 #include "album.h"
-#include "collection.h"
-#include "typedefs.h"
 
 #include "dllmacro.h"
 

src/libtomahawk/database/databasecommand_allartists.cpp

@@ -20,7 +20,9 @@
 
 #include <QSqlQuery>
 
+#include "artist.h"
 #include "databaseimpl.h"
+#include "source.h"
 #include "utils/tomahawkutils.h"
 #include "utils/logger.h"
 

src/libtomahawk/database/databasecommand_allartists.h

@@ -22,10 +22,8 @@
 #include <QObject>
 #include <QVariantMap>
 
-#include "databasecommand.h"
-#include "album.h"
-#include "collection.h"
 #include "typedefs.h"
+#include "databasecommand.h"
 
 #include "dllmacro.h"
 

src/libtomahawk/database/databasecommand_alltracks.h

@@ -23,7 +23,6 @@
 #include <QVariantMap>
 
 #include "databasecommand.h"
-#include "album.h"
 #include "collection.h"
 #include "typedefs.h"
 

src/libtomahawk/database/databasecommand_clientauthvalid.cpp

@@ -18,6 +18,8 @@
 
 #include "databasecommand_clientauthvalid.h"
 
+#include "databaseimpl.h"
+#include "tomahawksqlquery.h"
 #include "utils/logger.h"
 
 

src/libtomahawk/database/databasecommand_clientauthvalid.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 #ifndef DATABASECOMMAND_CLIENTAUTHVALID_H
 #define DATABASECOMMAND_CLIENTAUTHVALID_H
 
-#include "databaseimpl.h"
 #include "databasecommand.h"
 #include "dllmacro.h"
 
@@ -39,11 +38,11 @@ public:
 
     virtual void exec( DatabaseImpl* lib );
     virtual bool doesMutates() const { return false; }
-    
+
 signals:
     // if auth is invalid name is empty
     void authValid( const QString& clientToken, const QString& name, bool valid );
-    
+
 private:
     QString m_clientToken;
 };

src/libtomahawk/database/databasecommand_collectionstats.cpp

@@ -19,6 +19,7 @@
 #include "databasecommand_collectionstats.h"
 
 #include "databaseimpl.h"
+#include "source.h"
 #include "utils/logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/database/databasecommand_collectionstats.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 #include <QVariantMap>
 
 #include "databasecommand.h"
-#include "source.h"
 #include "typedefs.h"
 
 #include "dllmacro.h"

src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp

@@ -21,12 +21,15 @@
 #include <QSqlQuery>
 #include <QSqlDriver>
 
+#include "databaseimpl.h"
+#include "tomahawksqlquery.h"
 #include "dynamic/DynamicPlaylist.h"
 #include "dynamic/DynamicControl.h"
 #include "dynamic/GeneratorInterface.h"
 
-#include "network/servent.h"
+#include "source.h"
 #include "viewmanager.h"
+#include "network/servent.h"
 #include "utils/logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/database/databasecommand_createdynamicplaylist.h

@@ -19,10 +19,8 @@
 #ifndef DATABASECOMMAND_CREATEDYNAMICPLAYLIST_H
 #define DATABASECOMMAND_CREATEDYNAMICPLAYLIST_H
 
-#include "databaseimpl.h"
-#include "databasecommand_createplaylist.h"
-#include "dynamic/DynamicPlaylist.h"
 #include "typedefs.h"
+#include "databasecommand_createplaylist.h"
 
 /**
  * Create a new dynamic playlist in the database, based on an existing playlist.
@@ -48,7 +46,6 @@ public:
 
     virtual bool loggable() const { return m_autoLoad; }
 
-
     QVariant playlistV() const
     {
         if( m_v.isNull() )

src/libtomahawk/database/databasecommand_createplaylist.cpp

@@ -20,8 +20,11 @@
 
 #include <QSqlQuery>
 
-#include "network/servent.h"
+#include "source.h"
 #include "viewmanager.h"
+#include "databaseimpl.h"
+#include "tomahawksqlquery.h"
+#include "network/servent.h"
 #include "utils/logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/database/databasecommand_createplaylist.h

@@ -19,10 +19,9 @@
 #ifndef DATABASECOMMAND_CREATEPLAYLIST_H
 #define DATABASECOMMAND_CREATEPLAYLIST_H
 
-#include "databaseimpl.h"
-#include "databasecommandloggable.h"
-#include "playlist.h"
 #include "typedefs.h"
+#include "databasecommandloggable.h"
+#include "qjson/qobjecthelper.h"
 
 #include "dllmacro.h"
 
@@ -62,6 +61,7 @@ protected:
     void setPlaylist( const Tomahawk::playlist_ptr& playlist ) { m_playlist = playlist; }
 
     QVariant m_v;
+
 private:
     Tomahawk::playlist_ptr m_playlist;
     bool m_report; // call Playlist::reportCreated?

src/libtomahawk/database/databasecommand_deletedynamicplaylist.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -19,27 +19,25 @@
 #ifndef DATABASECOMMAND_DELETEDYNAMICPLAYLIST_H
 #define DATABASECOMMAND_DELETEDYNAMICPLAYLIST_H
 
-#include "databaseimpl.h"
 #include "databasecommand_deleteplaylist.h"
-#include "source.h"
 #include "typedefs.h"
 
 class DatabaseCommand_DeleteDynamicPlaylist : public DatabaseCommand_DeletePlaylist
 {
-    Q_OBJECT    
+    Q_OBJECT
 public:
     explicit DatabaseCommand_DeleteDynamicPlaylist( QObject* parent = 0 )
     : DatabaseCommand_DeletePlaylist( parent )
     {}
-    
+
     explicit DatabaseCommand_DeleteDynamicPlaylist( const Tomahawk::source_ptr& source, const QString& playlistguid );
-    
+
     QString commandname() const { return "deletedynamicplaylist"; }
-    
+
     virtual void exec( DatabaseImpl* lib );
     virtual void postCommitHook();
     virtual bool doesMutates() const { return true; }
-   
+
 };
 
 #endif // DATABASECOMMAND_DELETEDYNAMICPLAYLIST_H

src/libtomahawk/database/databasecommand_deletefiles.cpp

@@ -23,10 +23,11 @@
 #include "artist.h"
 #include "album.h"
 #include "collection.h"
+#include "source.h"
 #include "database/database.h"
 #include "databasecommand_collectionstats.h"
 #include "databaseimpl.h"
-#include "network/controlconnection.h"
+#include "network/servent.h"
 #include "utils/logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/database/databasecommand_deletefiles.h

@@ -25,7 +25,6 @@
 
 #include "database/databasecommandloggable.h"
 #include "typedefs.h"
-#include "query.h"
 
 #include "dllmacro.h"
 

src/libtomahawk/database/databasecommand_dirmtimes.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 
 #include <QObject>
 #include <QVariantMap>
+#include <QDir>
 #include <QMap>
 
 #include "databasecommand.h"
@@ -37,7 +38,7 @@ public:
     explicit DatabaseCommand_DirMtimes( const QString& prefix = QString(), QObject* parent = 0 )
         : DatabaseCommand( parent ), m_prefix( prefix ), m_update( false )
     {}
-    
+
     explicit DatabaseCommand_DirMtimes( const QStringList& prefixes, QObject* parent = 0 )
     : DatabaseCommand( parent ), m_prefixes( prefixes ), m_update( false )
     {}
@@ -57,7 +58,7 @@ public slots:
 
 private:
     void execSelectPath( DatabaseImpl *dbi, const QDir& path, QMap<QString, unsigned int> &mtimes );
-        
+
     void execSelect( DatabaseImpl* dbi );
     void execUpdate( DatabaseImpl* dbi );
     QString m_prefix;

src/libtomahawk/database/databasecommand_filemtimes.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -22,6 +22,7 @@
 #include <QObject>
 #include <QVariantMap>
 #include <QMap>
+#include <QDir>
 
 #include "databasecommand.h"
 
@@ -37,7 +38,7 @@ public:
     explicit DatabaseCommand_FileMtimes( const QString& prefix = QString(), QObject* parent = 0 )
         : DatabaseCommand( parent ), m_prefix( prefix )
     {}
-    
+
     explicit DatabaseCommand_FileMtimes( const QStringList& prefixes, QObject* parent = 0 )
     : DatabaseCommand( parent ), m_prefixes( prefixes )
     {}

src/libtomahawk/database/databasecommand_genericselect.h

@@ -22,7 +22,6 @@
 #include <QVariantMap>
 
 #include "databasecommand.h"
-#include "source.h"
 #include "typedefs.h"
 
 #include "dllmacro.h"

src/libtomahawk/database/databasecommand_importplaylist.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -23,7 +23,6 @@
 #include <QVariantMap>
 
 #include "databasecommand.h"
-#include "tomahawk/source.h"
 
 #include "dllmacro.h"
 

src/libtomahawk/database/databasecommand_loadallautoplaylists.cpp

@@ -20,8 +20,9 @@
 
 #include <QSqlQuery>
 
-#include "dynamic/DynamicPlaylist.h"
 #include "databaseimpl.h"
+#include "source.h"
+#include "dynamic/DynamicPlaylist.h"
 #include "utils/logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/database/databasecommand_loadallplaylists.cpp

@@ -22,6 +22,7 @@
 #include <QSqlQuery>
 
 #include "playlist.h"
+#include "source.h"
 #include "databaseimpl.h"
 #include "utils/logger.h"
 

src/libtomahawk/database/databasecommand_loadallplaylists.h

@@ -23,8 +23,8 @@
 #include <QObject>
 #include <QVariantMap>
 
-#include "databasecommand.h"
 #include "typedefs.h"
+#include "databasecommand.h"
 
 #include "dllmacro.h"
 

src/libtomahawk/database/databasecommand_loadallsortedplaylists.h

@@ -19,7 +19,7 @@
 #ifndef DATABASECOMMAND_LOADALLSORTEDPLAYLISTS_H
 #define DATABASECOMMAND_LOADALLSORTEDPLAYLISTS_H
 
-#include "libtomahawk/database/databasecommand.h"
+#include "databasecommand.h"
 #include "databasecommand_loadallplaylists.h"
 
 /**

src/libtomahawk/database/databasecommand_loadallstations.cpp

@@ -20,8 +20,9 @@
 
 #include <QSqlQuery>
 
-#include "dynamic/DynamicPlaylist.h"
 #include "databaseimpl.h"
+#include "source.h"
+#include "dynamic/DynamicPlaylist.h"
 #include "utils/logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/database/databasecommand_loaddynamicplaylist.cpp

@@ -20,8 +20,9 @@
 
 #include <QSqlQuery>
 
-#include "dynamic/DynamicPlaylist.h"
 #include "databaseimpl.h"
+#include "source.h"
+#include "dynamic/DynamicPlaylist.h"
 #include "utils/logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.cpp

@@ -25,7 +25,8 @@
 #include "tomahawksqlquery.h"
 #include "dynamic/DynamicControl.h"
 #include "dynamic/GeneratorInterface.h"
-#include <dynamic/GeneratorFactory.h>
+#include "dynamic/GeneratorFactory.h"
+#include "qjson/parser.h"
 #include "utils/logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.h

@@ -26,7 +26,6 @@
 #include "databasecommand.h"
 #include "databasecommand_loadplaylistentries.h"
 #include "playlist.h"
-#include "dynamic/DynamicControl.h"
 
 class DatabaseCommand_LoadDynamicPlaylistEntries : public DatabaseCommand_LoadPlaylistEntries
 {

src/libtomahawk/database/databasecommand_loadops.cpp

@@ -18,6 +18,9 @@
 
 #include "databasecommand_loadops.h"
 
+#include "databaseimpl.h"
+#include "tomahawksqlquery.h"
+#include "source.h"
 #include "utils/logger.h"
 
 

src/libtomahawk/database/databasecommand_loadops.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -21,7 +21,6 @@
 
 #include "typedefs.h"
 #include "databasecommand.h"
-#include "databaseimpl.h"
 #include "op.h"
 
 #include "dllmacro.h"

src/libtomahawk/database/databasecommand_loadplaylistentries.cpp

@@ -21,6 +21,8 @@
 #include <QSqlQuery>
 
 #include "databaseimpl.h"
+#include "query.h"
+#include "qjson/parser.h"
 #include "utils/logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/database/databasecommand_loadplaylistentries.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -41,6 +41,7 @@ public:
     virtual QString commandname() const { return "loadplaylistentries"; }
 
     QString revisionGuid() const { return m_revguid; }
+
 signals:
     void done( const QString& rev,
                const QList<QString>& orderedguid,
@@ -51,12 +52,12 @@ signals:
 
 protected:
     void generateEntries( DatabaseImpl* dbi );
-    
+
     QStringList m_guids;
     QMap< QString, Tomahawk::plentry_ptr > m_entrymap;
     bool m_islatest;
     QStringList m_oldentries;
-    
+
 private:
     QString m_revguid;
 };

src/libtomahawk/database/databasecommand_loadsocialactions.h

@@ -26,19 +26,18 @@
 #include "sourcelist.h"
 #include "typedefs.h"
 #include "artist.h"
-#include "result.h"
 
 #include "dllmacro.h"
 
 /**
  * \class DatabaseCommand_LoadSocialActions
  * \brief Database command used to load social actions from the database.
- * 
+ *
  * This Database command allows Tomahawk to load social actions from
  * the local database. The loaded social actions can be used to create
  * dynamic playlists, generate statistics and provide data to share with
  * friends on tomahawk.
- * 
+ *
  * \see DatabaseCommand_SocialAction
  */
 class DLLEXPORT DatabaseCommand_LoadSocialActions : public DatabaseCommand
@@ -48,20 +47,20 @@ Q_OBJECT
 public:
     /**
      * \brief Default constructor for DatabaseCommand_LoadSocialActions.
-     * 
+     *
      * Constructs an empty database command for loading social actions.
-     */ 
+     */
     explicit DatabaseCommand_LoadSocialActions( QObject* parent = 0 )
         : DatabaseCommand( parent )
     {}
-    
+
     /**
      * \brief Overloaded constructor for DatabaseCommand_LoadSocialAction.
      * \param result Pointer to a Tomahawk::Result.
      * \param parent Parent class.
-     * 
+     *
      * Constructor which creates a new database command for loading all social actions.
-     */ 
+     */
     explicit DatabaseCommand_LoadSocialActions( Tomahawk::Result* result, QObject* parent = 0 )
         : DatabaseCommand( parent ), m_result( result )
     {
@@ -69,7 +68,7 @@ public:
         setArtist( result->artist()->name() );
         setTrack( result->track() );
     }
-    
+
     /**
      * \brief Returns the name of this database command.
      * \return QString containing the database command name 'loadsocialaction'.
@@ -79,21 +78,21 @@ public:
     /**
      * \brief Executes the database command.
      * \param dbi Database instance.
-     * 
+     *
      * This method prepares an sql query to load the social actions
      * from the database into a list of all social actions.
-     * 
+     *
      * \see Result::setAllSocialActions()
      */
     virtual void exec( DatabaseImpl* );
-    
+
     /**
      * \brief Returns the artist associated with this database command.
      * \return Name of the artist.
      * \see setArtist()
      */
     QString artist() const { return m_artist; }
-    
+
     /**
      * \brief Sets the artist name for this database command.
      * \param s QString containing the artist name.
@@ -107,29 +106,29 @@ public:
      * \see setTrack()
      */
     QString track() const { return m_track; }
-    
+
     /**
      * \brief Sets the track name associated with this database command.
      * \param track QString containing the track name.
      * \see track()
-     */ 
+     */
     void setTrack( const QString& s ) { m_track = s; }
-    
+
 signals:
-    
+
     /**
      * \brief Emitted when the database command has finished the Query successfully
-     * 
+     *
      * \param QList of all social actions
      * \see QList
      */
     void done( QList< Tomahawk::SocialAction >& allSocialActions );
-    
+
 private:
     Tomahawk::Result* m_result;
     QString m_artist;
     QString m_track;
-   
+
 };
 
 #endif // DATABASECOMMAND_LOADSOCIALACTIONS_H

src/libtomahawk/database/databasecommand_logplayback.h

@@ -25,9 +25,8 @@
 #include "database/databasecommandloggable.h"
 #include "sourcelist.h"
 #include "typedefs.h"
-#include "query.h"
-#include "result.h"
 #include "artist.h"
+#include "query.h"
 
 #include "dllmacro.h"
 

src/libtomahawk/database/databasecommand_modifyplaylist.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -22,9 +22,8 @@
 #include <QObject>
 #include <QVariantMap>
 
+#include "typedefs.h"
 #include "databasecommand.h"
-#include "source.h"
-#include "playlist.h"
 
 #include "dllmacro.h"
 

src/libtomahawk/database/databasecommand_playbackhistory.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -23,7 +23,6 @@
 #include <QVariantMap>
 
 #include "databasecommand.h"
-#include "source.h"
 #include "typedefs.h"
 
 #include "dllmacro.h"

src/libtomahawk/database/databasecommand_renameplaylist.cpp

@@ -20,8 +20,10 @@
 
 #include <QSqlQuery>
 
-#include "network/servent.h"
+#include "databaseimpl.h"
 #include "collection.h"
+#include "source.h"
+#include "network/servent.h"
 #include "utils/logger.h"
 
 using namespace Tomahawk;
@@ -38,8 +40,6 @@ DatabaseCommand_RenamePlaylist::DatabaseCommand_RenamePlaylist( const source_ptr
 void
 DatabaseCommand_RenamePlaylist::exec( DatabaseImpl* lib )
 {
-    qDebug() << Q_FUNC_INFO;
-
     TomahawkSqlQuery cre = lib->newquery();
 
     QString sql = QString( "UPDATE playlist SET title = :title WHERE guid = :id AND source %1" )
@@ -58,13 +58,6 @@ DatabaseCommand_RenamePlaylist::exec( DatabaseImpl* lib )
 void
 DatabaseCommand_RenamePlaylist::postCommitHook()
 {
-    qDebug() << Q_FUNC_INFO << "..reporting..";
-    if ( source().isNull() || source()->collection().isNull() )
-    {
-        qDebug() << "Source has gone offline, not emitting to GUI.";
-        return;
-    }
-
     playlist_ptr playlist = source()->collection()->playlist( m_playlistguid );
     // fallback, check for auto and stations too
     if( playlist.isNull() )

src/libtomahawk/database/databasecommand_renameplaylist.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -19,13 +19,13 @@
 #ifndef DATABASECOMMAND_RENAMEPLAYLIST_H
 #define DATABASECOMMAND_RENAMEPLAYLIST_H
 
-#include "databaseimpl.h"
-#include "databasecommandloggable.h"
-#include "source.h"
 #include "typedefs.h"
+#include "databasecommandloggable.h"
 
 #include "dllmacro.h"
 
+class DatabaseImpl;
+
 class DLLEXPORT DatabaseCommand_RenamePlaylist : public DatabaseCommandLoggable
 {
 Q_OBJECT

src/libtomahawk/database/databasecommand_resolve.cpp

@@ -18,6 +18,7 @@
 
 #include "databasecommand_resolve.h"
 
+#include "artist.h"
 #include "album.h"
 #include "sourcelist.h"
 #include "utils/logger.h"

src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp

@@ -20,9 +20,12 @@
 
 #include <QSqlQuery>
 
+#include "source.h"
+#include "databaseimpl.h"
 #include "tomahawksqlquery.h"
 #include "dynamic/DynamicPlaylist.h"
 #include "dynamic/DynamicControl.h"
+#include "network/servent.h"
 #include "utils/logger.h"
 
 

src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.h

@@ -20,11 +20,7 @@
 #define DATABASECOMMAND_SETDYNAMICPLAYLISTREVISION_H
 
 #include "databasecommand_setplaylistrevision.h"
-#include "databaseimpl.h"
-#include "collection.h"
-#include "playlist.h"
 #include "dynamic/GeneratorInterface.h"
-#include "network/servent.h"
 
 using namespace Tomahawk;
 

src/libtomahawk/database/databasecommand_setplaylistrevision.cpp

@@ -20,6 +20,8 @@
 
 #include <QSqlQuery>
 
+#include "source.h"
+#include "databaseimpl.h"
 #include "tomahawksqlquery.h"
 #include "network/servent.h"
 #include "utils/logger.h"

src/libtomahawk/database/databasecommand_setplaylistrevision.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -20,9 +20,8 @@
 #define DATABASECOMMAND_SETPLAYLISTREVISION_H
 
 #include "databasecommandloggable.h"
-#include "databaseimpl.h"
-#include "collection.h"
 #include "playlist.h"
+#include "qjson/qobjecthelper.h"
 
 #include "dllmacro.h"
 
@@ -99,7 +98,7 @@ protected:
     QString m_playlistguid;
     QString m_newrev, m_oldrev;
     QMap<QString, Tomahawk::plentry_ptr> m_addedmap;
-    
+
     QString m_currentRevision;
 private:
     QVariantList m_orderedguids;

src/libtomahawk/database/databasecommand_sourceoffline.cpp

@@ -18,6 +18,8 @@
 
 #include "databasecommand_sourceoffline.h"
 
+#include "databaseimpl.h"
+#include "tomahawksqlquery.h"
 #include "utils/logger.h"
 
 

src/libtomahawk/database/databasecommand_sourceoffline.h

@@ -20,8 +20,6 @@
 #define DATABASECOMMAND_SOURCEOFFLINE_H
 
 #include "databasecommand.h"
-#include "databaseimpl.h"
-
 #include "dllmacro.h"
 
 class DLLEXPORT DatabaseCommand_SourceOffline : public DatabaseCommand

src/libtomahawk/database/databasecommand_updatesearchindex.cpp

@@ -18,6 +18,8 @@
 
 #include "databasecommand_updatesearchindex.h"
 
+#include "databaseimpl.h"
+#include "tomahawksqlquery.h"
 #include "utils/logger.h"
 
 

src/libtomahawk/database/databasecommand_updatesearchindex.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -20,8 +20,6 @@
 #define DATABASECOMMAND_UPDATESEARCHINDEX_H
 
 #include "databasecommand.h"
-#include "databaseimpl.h"
-
 #include "dllmacro.h"
 
 class DLLEXPORT DatabaseCommand_UpdateSearchIndex : public DatabaseCommand
@@ -39,7 +37,7 @@ signals:
 
 private:
     void indexTable( DatabaseImpl* db, const QString& table );
-    
+
     QString table;
 };
 

src/libtomahawk/database/databasecommandloggable.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #define DATABASECOMMANDLOGGABLE_H
 
 #include "database/databasecommand.h"
-
 #include "dllmacro.h"
 
 /// A Database Command that will be added to the oplog and sent over the network

src/libtomahawk/database/databaseresolver.cpp

@@ -18,6 +18,7 @@
 
 #include "databaseresolver.h"
 
+#include "pipeline.h"
 #include "network/servent.h"
 #include "database/database.h"
 #include "database/databasecommand_resolve.h"

src/libtomahawk/database/databaseresolver.h

@@ -19,8 +19,6 @@
 #ifndef DATABASERESOLVER_H
 #define DATABASERESOLVER_H
 
-#include "pipeline.h"
-
 #include "resolver.h"
 #include "result.h"
 

src/libtomahawk/database/databaseworker.cpp

@@ -22,8 +22,11 @@
 #include <QTime>
 #include <QSqlQuery>
 
-#include "database/database.h"
-#include "database/databasecommandloggable.h"
+#include "source.h"
+#include "database.h"
+#include "databaseimpl.h"
+#include "databasecommandloggable.h"
+#include "tomahawksqlquery.h"
 #include "utils/logger.h"
 
 #ifndef QT_NO_DEBUG

src/libtomahawk/database/databaseworker.h

@@ -30,7 +30,6 @@
 #include <qjson/qobjecthelper.h>
 
 #include "databasecommand.h"
-#include "databaseimpl.h"
 
 class Database;
 class DatabaseCommandLoggable;

src/libtomahawk/dropjob.cpp

@@ -21,6 +21,7 @@
 
 #include "artist.h"
 #include "album.h"
+#include "source.h"
 
 #include "utils/spotifyparser.h"
 #include "utils/rdioparser.h"

src/libtomahawk/globalactionmanager.h

@@ -20,8 +20,8 @@
 #ifndef GLOBALACTIONMANAGER_H
 #define GLOBALACTIONMANAGER_H
 
-#include "playlist.h"
 #include "query.h"
+#include "playlist.h"
 #include "playlist/dynamic/DynamicPlaylist.h"
 #include "dllmacro.h"
 

src/libtomahawk/infobar/infobar.h

@@ -22,7 +22,6 @@
 #include <QWidget>
 
 #include "dllmacro.h"
-#include "query.h"
 
 class QTimeLine;
 class QSearchField;

src/libtomahawk/infosystem/infoplugins/generic/echonestplugin.h

@@ -25,8 +25,10 @@
 #include <QObject>
 
 class QNetworkReply;
-namespace Echonest {
-class Artist;
+
+namespace Echonest
+{
+    class Artist;
 }
 
 namespace Tomahawk

src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h

@@ -20,7 +20,6 @@
 
 #include "infosystem/infosystem.h"
 #include "infosystem/infosystemworker.h"
-#include "result.h"
 
 #include <lastfm/Track>
 #include <lastfm/Audioscrobbler>

src/libtomahawk/infosystem/infoplugins/unix/mprisplugin.h

@@ -26,9 +26,11 @@
 #include <QVariant>
 #include <QtDBus/QtDBus>
 
-namespace Tomahawk {
+namespace Tomahawk
+{
 
-namespace InfoSystem {
+namespace InfoSystem
+{
 
 class MprisPlugin : public InfoPlugin
 {
@@ -41,7 +43,7 @@ public:
     // MPRIS DBus Methods
 
     // org.mpris.MediaPlayer2
-    
+
     Q_PROPERTY(bool CanQuit READ canQuit)
     bool canQuit() const;
 
@@ -159,7 +161,7 @@ signals:
 
 private:
     // Get Info
-    
+
     // Push Info
     void audioStarted( const QVariant &input );
     void audioFinished( const QVariant &input );
@@ -171,12 +173,10 @@ private:
     void notifyPropertyChanged( const QString& interface, const QString& propertyName );
     QString m_playbackStatus;
     QTemporaryFile *m_coverTempFile;
-
 };
 
 };
 
-
 }
 
 #endif // MPRISPLUGIN_H

src/libtomahawk/infosystem/infoplugins/unix/mprispluginplayeradaptor.h

@@ -14,6 +14,7 @@
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
+
 class QByteArray;
 template<class T> class QList;
 template<class Key, class Value> class QMap;

src/libtomahawk/infosystem/infoplugins/unix/mprispluginrootadaptor.h

@@ -14,6 +14,7 @@
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
+
 class QByteArray;
 template<class T> class QList;
 template<class Key, class Value> class QMap;

src/libtomahawk/network/controlconnection.cpp

@@ -23,7 +23,9 @@
 #include "database/databasecommand_collectionstats.h"
 #include "dbsyncconnection.h"
 #include "sourcelist.h"
-#include <sip/SipHandler.h>
+#include "network/dbsyncconnection.h"
+#include "network/servent.h"
+#include "sip/SipHandler.h"
 #include "utils/logger.h"
 
 #define TCP_TIMEOUT 600

src/libtomahawk/network/controlconnection.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -26,13 +26,14 @@
 #ifndef CONTROLCONNECTION_H
 #define CONTROLCONNECTION_H
 
-#include "connection.h"
-#include "network/servent.h"
-#include "source.h"
 #include "typedefs.h"
+#include "connection.h"
 
 #include "dllmacro.h"
 
+class Servent;
+class DBSyncConnection;
+
 class DLLEXPORT ControlConnection : public Connection
 {
 Q_OBJECT
@@ -52,8 +53,6 @@ protected:
 protected slots:
     virtual void handleMsg( msg_ptr msg );
 
-signals:
-
 private slots:
     void dbSyncConnFinished( QObject* c );
     void registerSource();

src/libtomahawk/network/msgprocessor.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -31,7 +31,6 @@
 #define MSGPROCESSOR_H
 
 #include <QObject>
-#include "msg.h"
 #include <QtConcurrentRun>
 #include <QFuture>
 #include <QFutureWatcher>
@@ -40,6 +39,8 @@
 #include <qjson/serializer.h>
 #include <qjson/qobjecthelper.h>
 
+#include "msg.h"
+
 class MsgProcessor : public QObject
 {
 Q_OBJECT

src/libtomahawk/network/streamconnection.cpp

@@ -24,6 +24,7 @@
 
 #include "bufferiodevice.h"
 #include "network/controlconnection.h"
+#include "network/servent.h"
 #include "database/databasecommand_loadfile.h"
 #include "database/database.h"
 #include "sourcelist.h"

src/libtomahawk/network/streamconnection.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -56,7 +56,7 @@ public:
     const QSharedPointer<QIODevice>& iodevice() { return m_iodev; }
     ControlConnection* controlConnection() const { return m_cc; }
 
-	Tomahawk::source_ptr source() const;
+    Tomahawk::source_ptr source() const;
     Tomahawk::result_ptr track() const { return m_result; }
     qint64 transferRate() const { return m_transferRate; }
 

src/libtomahawk/pipeline.h

@@ -27,15 +27,13 @@
 
 #include "typedefs.h"
 #include "query.h"
-#include "result.h"
-#include "resolver.h"
 
 #include "dllmacro.h"
 
 namespace Tomahawk
 {
-
 class Resolver;
+class ExternalResolver;
 
 class DLLEXPORT Pipeline : public QObject
 {

src/libtomahawk/playlist.h

@@ -23,14 +23,13 @@
 #include <QList>
 #include <QVariant>
 #include <QSharedPointer>
+#include <QQueue>
 
-#include "query.h"
 #include "typedefs.h"
-
+#include "result.h"
 #include "playlistinterface.h"
 
 #include "dllmacro.h"
-#include <QQueue>
 
 class DatabaseCommand_LoadAllPlaylists;
 class DatabaseCommand_LoadAllSortedPlaylists;
@@ -78,7 +77,6 @@ public:
     source_ptr lastSource() const;
     void setLastSource( source_ptr s );
 
-
 private:
     QString m_guid;
     Tomahawk::query_ptr m_query;

src/libtomahawk/playlist/albumitemdelegate.cpp

@@ -22,6 +22,7 @@
 #include <QPainter>
 #include <QAbstractItemView>
 
+#include "artist.h"
 #include "query.h"
 #include "result.h"
 

src/libtomahawk/playlist/albummodel.cpp

@@ -22,8 +22,10 @@
 #include <QMimeData>
 #include <QNetworkReply>
 
+#include "artist.h"
+#include "albumitem.h"
+#include "source.h"
 #include "database/database.h"
-
 #include "utils/tomahawkutils.h"
 #include "utils/logger.h"
 

src/libtomahawk/playlist/albummodel.h

@@ -23,15 +23,13 @@
 #include <QPixmap>
 
 #include "album.h"
-#include "collection.h"
 #include "playlistinterface.h"
 #include "database/databasecommand_allalbums.h"
 #include "infosystem/infosystem.h"
 
-#include "albumitem.h"
-
 #include "dllmacro.h"
 
+class AlbumItem;
 class QMetaData;
 
 class DLLEXPORT AlbumModel : public QAbstractItemModel

src/libtomahawk/playlist/albumproxymodel.cpp

@@ -20,6 +20,8 @@
 
 #include <QListView>
 
+#include "artist.h"
+#include "albumitem.h"
 #include "query.h"
 #include "utils/logger.h"
 

src/libtomahawk/playlist/albumview.cpp

@@ -24,9 +24,11 @@
 #include <QScrollBar>
 
 #include "audio/audioengine.h"
-
 #include "tomahawksettings.h"
+#include "artist.h"
+#include "albumitem.h"
 #include "albumitemdelegate.h"
+#include "albummodel.h"
 #include "viewmanager.h"
 #include "utils/logger.h"
 

src/libtomahawk/playlist/albumview.h

@@ -21,12 +21,13 @@
 
 #include <QListView>
 #include <QSortFilterProxyModel>
+#include <QTimer>
 
-#include "albummodel.h"
-#include "albumproxymodel.h"
 #include "viewpage.h"
-
 #include "dllmacro.h"
+#include "albumproxymodel.h"
+
+class AlbumModel;
 
 class DLLEXPORT AlbumView : public QListView, public Tomahawk::ViewPage
 {

src/libtomahawk/playlist/artistview.cpp

@@ -30,6 +30,7 @@
 #include "tomahawksettings.h"
 #include "treeheader.h"
 #include "treeitemdelegate.h"
+#include "treemodel.h"
 #include "viewmanager.h"
 #include "utils/logger.h"
 

src/libtomahawk/playlist/artistview.h

@@ -19,11 +19,11 @@
 #ifndef ARTISTVIEW_H
 #define ARTISTVIEW_H
 
-#include <QTreeView>
 #include <QSortFilterProxyModel>
+#include <QTreeView>
+#include <QTimer>
 
 #include "contextmenu.h"
-#include "treemodel.h"
 #include "treeproxymodel.h"
 #include "viewpage.h"
 
@@ -32,6 +32,7 @@
 class TreeHeader;
 class LoadingSpinner;
 class OverlayWidget;
+class TreeModel;
 
 class DLLEXPORT ArtistView : public QTreeView, public Tomahawk::ViewPage
 {

src/libtomahawk/playlist/collectionflatmodel.h

@@ -23,12 +23,10 @@
 #include <QList>
 #include <QHash>
 
-#include "trackmodelitem.h"
-#include "trackmodel.h"
-#include "collection.h"
-#include "query.h"
 #include "typedefs.h"
-#include "playlist.h"
+#include "trackmodel.h"
+#include "query.h"
+#include "source.h"
 #include "playlistinterface.h"
 
 #include "database/databasecommand_alltracks.h"

src/libtomahawk/playlist/collectionview.cpp

@@ -21,7 +21,8 @@
 #include <QDragEnterEvent>
 #include <QPainter>
 
-#include "playlist/collectionproxymodel.h"
+#include "collectionproxymodel.h"
+#include "trackmodel.h"
 #include "widgets/overlaywidget.h"
 #include "utils/logger.h"
 

src/libtomahawk/playlist/collectionview.h

@@ -20,12 +20,13 @@
 #define COLLECTIONVIEW_H
 
 #include "trackproxymodel.h"
-#include "trackmodel.h"
 #include "trackview.h"
 #include "viewpage.h"
 
 #include "dllmacro.h"
 
+class TrackModel;
+
 class DLLEXPORT CollectionView : public TrackView, public Tomahawk::ViewPage
 {
 Q_OBJECT

src/libtomahawk/playlist/dynamic/DynamicModel.cpp

@@ -17,9 +17,13 @@
  */
 
 #include "playlist/dynamic/DynamicModel.h"
+
 #include "GeneratorInterface.h"
+#include "pipeline.h"
+#include "query.h"
+#include "source.h"
 #include "audio/audioengine.h"
-#include <pipeline.h>
+
 #include "utils/logger.h"
 
 using namespace Tomahawk;

src/libtomahawk/playlist/dynamic/DynamicPlaylist.h

@@ -23,8 +23,8 @@
 #include <QList>
 #include <QSharedPointer>
 
-#include "playlist.h"
 #include "typedefs.h"
+#include "playlist.h"
 #include "playlist/dynamic/DynamicControl.h"
 #include "playlist/dynamic/DynamicPlaylistRevision.h"
 

src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h

@@ -20,7 +20,6 @@
 #define COLLAPSIBLE_CONTROLS_H
 
 #include "typedefs.h"
-#include "source.h"
 
 #include <QWidget>
 
@@ -30,6 +29,7 @@ class QTimeLine;
 class QToolButton;
 class ElidedLabel;
 class QStackedLayout;
+
 namespace Tomahawk
 {
 

src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp

@@ -32,6 +32,7 @@
 #include "dynamic/GeneratorInterface.h"
 #include "dynamic/GeneratorFactory.h"
 #include "pipeline.h"
+#include "source.h"
 #include "audio/audioengine.h"
 #include "ReadOrWriteWidget.h"
 #include "CollapsibleControls.h"