diff --git a/src/libtomahawk/UrlHandler.cpp b/src/libtomahawk/UrlHandler.cpp
index 2fc7167f2..315c73f34 100644
--- a/src/libtomahawk/UrlHandler.cpp
+++ b/src/libtomahawk/UrlHandler.cpp
@@ -103,7 +103,7 @@ localFileIODeviceFactory( const Tomahawk::result_ptr&, const QString& url,
     if ( io )
         io->open( QIODevice::ReadOnly );
 
-    //boost::functions cannot accept temporaries as parameters
+    // std::functions cannot accept temporaries as parameters
     QSharedPointer< QIODevice > sp = QSharedPointer<QIODevice>( io );
     callback( url, sp );
 }
diff --git a/src/libtomahawk/network/ConnectionManager.cpp b/src/libtomahawk/network/ConnectionManager.cpp
index 91739971b..478c04859 100644
--- a/src/libtomahawk/network/ConnectionManager.cpp
+++ b/src/libtomahawk/network/ConnectionManager.cpp
@@ -33,7 +33,6 @@
 #include "Servent.h"
 #include "Source.h"
 
-#include <boost/bind.hpp>
 #include <qtconcurrentrun.h>
 
 /* Management of ConnectionManagers */
diff --git a/src/libtomahawk/network/Servent.cpp b/src/libtomahawk/network/Servent.cpp
index be3100822..43ae9fbbb 100644
--- a/src/libtomahawk/network/Servent.cpp
+++ b/src/libtomahawk/network/Servent.cpp
@@ -1261,7 +1261,7 @@ Servent::remoteIODeviceFactory( const Tomahawk::result_ptr& result, const QStrin
     StreamConnection* sc = new StreamConnection( this, cc, fileId, result );
     createParallelConnection( cc, sc, QString( "FILE_REQUEST_KEY:%1" ).arg( fileId ) );
 
-    //boost::functions cannot accept temporaries as parameters
+    // std::functions cannot accept temporaries as parameters
     sp = sc->iodevice();
     callback( result->url(), sp );
 }
diff --git a/src/libtomahawk/network/Servent_p.h b/src/libtomahawk/network/Servent_p.h
index 230e1d1f7..5d0dec7fc 100644
--- a/src/libtomahawk/network/Servent_p.h
+++ b/src/libtomahawk/network/Servent_p.h
@@ -27,8 +27,6 @@
 #include <QMutex>
 #include <QStringList>
 
-#include <boost/function.hpp>
-
 class ServentPrivate : public QObject
 {
 Q_OBJECT
diff --git a/src/libtomahawk/resolvers/ExternalResolver.h b/src/libtomahawk/resolvers/ExternalResolver.h
index 2cee70750..10f165369 100644
--- a/src/libtomahawk/resolvers/ExternalResolver.h
+++ b/src/libtomahawk/resolvers/ExternalResolver.h
@@ -31,8 +31,6 @@
 #include "ScriptCommand_LookupUrl.h"
 #include "Typedefs.h"
 
-#include <boost/function.hpp>
-
 #include <QObject>
 
 class QWidget;
diff --git a/src/libtomahawk/resolvers/JSResolver.cpp b/src/libtomahawk/resolvers/JSResolver.cpp
index 235bc159c..66d5086f1 100644
--- a/src/libtomahawk/resolvers/JSResolver.cpp
+++ b/src/libtomahawk/resolvers/JSResolver.cpp
@@ -53,8 +53,6 @@
 #include <QTime>
 #include <QWebFrame>
 
-#include <boost/bind.hpp>
-
 JSResolver::JSResolver( const QString& accountId, const QString& scriptPath, const QStringList& additionalScriptPaths )
     : Tomahawk::ExternalResolverGui( scriptPath )
     , d_ptr( new JSResolverPrivate( this, accountId, scriptPath, additionalScriptPaths ) )
diff --git a/src/libtomahawk/resolvers/JSResolverHelper.cpp b/src/libtomahawk/resolvers/JSResolverHelper.cpp
index d8834ccb5..2286cdd86 100644
--- a/src/libtomahawk/resolvers/JSResolverHelper.cpp
+++ b/src/libtomahawk/resolvers/JSResolverHelper.cpp
@@ -900,7 +900,7 @@ Q_DECLARE_METATYPE( IODeviceCallback )
 void
 JSResolverHelper::gotStreamUrl( function< void( const QString&, QSharedPointer< QIODevice >& ) > callback, NetworkReply* reply )
 {
-    //boost::functions cannot accept temporaries as parameters
+    // std::functions cannot accept temporaries as parameters
     QSharedPointer< QIODevice > sp = QSharedPointer< QIODevice >( reply->reply(), &QObject::deleteLater );
     QString url = reply->reply()->url().toString();
     reply->disconnectFromReply();