diff --git a/src/collection/sqlcollection/SqlCollection.h b/src/collection/sqlcollection/SqlCollection.h
index 1d975120fb..86c68eb914 100644
--- a/src/collection/sqlcollection/SqlCollection.h
+++ b/src/collection/sqlcollection/SqlCollection.h
@@ -1,125 +1,127 @@
 /*
  *  Copyright (c) 2007 Maximilian Kossick <maximilian.kossick@googlemail.com>
  *  Copyright (c) 2007 Casey Link <unnamedrambler@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #ifndef AMAROK_COLLECTION_SQLCOLLECTION_H
 #define AMAROK_COLLECTION_SQLCOLLECTION_H
 
 #include "Collection.h"
 #include "CollectionManager.h"
 #include "DatabaseUpdater.h"
 #include "SqlRegistry.h"
 #include "SqlStorage.h"
 #include "amarok_export.h"
 
+#include <QPointer>
+
 class SqlCollectionFactory : public Amarok::CollectionFactory
 {
     Q_OBJECT
 
     public:
         SqlCollectionFactory() {}
         virtual ~SqlCollectionFactory() {}
 
         virtual void init();
 };
 
 class CollectionLocation;
 class XesamCollectionBuilder;
 class ScanManager;
 
 class SqlCollection : public Amarok::Collection, public SqlStorage
 {
     Q_OBJECT
 
     public:
         SqlCollection( const QString &id, const QString &prettyName );
         virtual ~SqlCollection();
 
         virtual void startFullScan();
         virtual void startIncrementalScan();
         virtual void stopScan();
         virtual QueryMaker* queryMaker();
 
         virtual QString uidUrlProtocol() const;
         virtual QString collectionId() const;
         virtual QString prettyName() const;
 
         SqlRegistry* registry() const;
         DatabaseUpdater* dbUpdater() const;
         ScanManager* scanManager() const;
         
         void removeCollection();    //testing, remove later
 
         virtual bool isDirInCollection( QString path );
         virtual bool isFileInCollection( const QString &url );
         virtual bool possiblyContainsTrack( const KUrl &url ) const;
         virtual Meta::TrackPtr trackForUrl( const KUrl &url );
 
         virtual CollectionLocation* location() const;
         virtual bool isWritable() const;
         virtual bool isOrganizable() const;
 
 
         //sqlcollection internal methods
         void sendChangedSignal();
 
         //methods defined in SqlStorage
         virtual int sqlDatabasePriority() const;
         virtual QString type() const;
 
         virtual QStringList query( const QString &query ) = 0;
         virtual int insert( const QString &statement, const QString &table ) = 0;
 
         virtual QString escape( QString text ) const;
 
         virtual QString boolTrue() const;
         virtual QString boolFalse() const;
 
         virtual QString idType() const;
         virtual QString textColumnType( int length = 255 ) const;
         virtual QString exactTextColumnType( int length = 1024 ) const;
         virtual QString longTextColumnType() const;
         virtual QString randomFunc() const;
 
         virtual void vacuum() const;
 
     public slots:
         void updateTrackUrls( TrackUrls changedUrls );
 
     signals:
         void scanFinished();
 
     protected:
         //this method MUST be called from subclass constructors
         void init();
 
     private slots:
         void initXesam();
 
     private:
         SqlRegistry* const m_registry;
         DatabaseUpdater * const m_updater;
-        ScanManager * const m_scanManager;
+        QPointer<ScanManager> m_scanManager;
 
         QString m_collectionId;
         QString m_prettyName;
 
         XesamCollectionBuilder *m_xesamBuilder;
 };
 
 #endif /* AMAROK_COLLECTION_SQLCOLLECTION_H */