diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index 9b28e3f50..058b7bed1 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -19,6 +19,8 @@
 
 #include "tomahawkapp.h"
 
+#include <iostream>
+
 #include <QtCore/QPluginLoader>
 #include <QtCore/QDir>
 #include <QtCore/QMetaType>
@@ -59,7 +61,6 @@
 #include "utils/logger.h"
 #include "utils/tomahawkutilsgui.h"
 
-#include <lastfm/ws.h>
 #include "config.h"
 
 #ifndef ENABLE_HEADLESS
@@ -309,8 +310,6 @@ TomahawkApp::~TomahawkApp()
     if ( !m_infoSystem.isNull() )
         delete m_infoSystem.data();
 
-    //FIXME: delete GeneratorFactory::registerFactory( "echonest", new EchonestFactory ); ?
-
     delete SipHandler::instance();
 
 #ifndef ENABLE_HEADLESS