diff --git a/src/pulseaudio.cpp b/src/pulseaudio.cpp
index fb08459..cdabadc 100644
--- a/src/pulseaudio.cpp
+++ b/src/pulseaudio.cpp
@@ -1,383 +1,384 @@
 /*
     Copyright 2014-2015 Harald Sitter <sitter@kde.org>
     Copyright 2016 David Rosca <nowrep@gmail.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
     version 2.1 of the License, or (at your option) version 3, or any
     later version accepted by the membership of KDE e.V. (or its
     successor approved by the membership of KDE e.V.), which shall
     act as a proxy defined in Section 6 of version 3 of the license.
 
     This library 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
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pulseaudio.h"
 
+#include "maps.h"
 #include "debug.h"
 #include "card.h"
 #include "sink.h"
 #include "sinkinput.h"
 #include "source.h"
 #include "sourceoutput.h"
 #include "server.h"
 #include "streamrestore.h"
 #include "module.h"
 #include "context.h"
 #include "context_p.h"
 
 #include <QMetaEnum>
 
 namespace PulseAudioQt
 {
 
 AbstractModel::AbstractModel(const MapBaseQObject *map, QObject *parent)
     : QAbstractListModel(parent)
     , m_map(map)
 {
     Context::instance()->ref();
 
     connect(m_map, &MapBaseQObject::aboutToBeAdded, this, [this](int index) {
         beginInsertRows(QModelIndex(), index, index);
     });
     connect(m_map, &MapBaseQObject::added, this, [this](int index) {
         onDataAdded(index);
         endInsertRows();
     });
     connect(m_map, &MapBaseQObject::aboutToBeRemoved, this, [this](int index) {
         beginRemoveRows(QModelIndex(), index, index);
     });
     connect(m_map, &MapBaseQObject::removed, this, [this](int index) {
         Q_UNUSED(index);
         endRemoveRows();
     });
 }
 
 AbstractModel::~AbstractModel()
 {
     //deref context after we've deleted this object
     //see https://bugs.kde.org/show_bug.cgi?id=371215
     Context::instance()->unref();
 }
 
 QHash<int, QByteArray> AbstractModel::roleNames() const
 {
     if (!m_roles.empty()) {
         qCDebug(PULSEAUDIOQT) << "returning roles" << m_roles;
         return m_roles;
     }
     Q_UNREACHABLE();
     return QHash<int, QByteArray>();
 }
 
 int AbstractModel::rowCount(const QModelIndex &parent) const
 {
     if (parent.isValid()) {
         return 0;
     }
     return m_map->count();
 }
 
 QVariant AbstractModel::data(const QModelIndex &index, int role) const
 {
     if (!hasIndex(index.row(), index.column())) {
         return QVariant();
     }
     QObject *data = m_map->objectAt(index.row());
     Q_ASSERT(data);
     if (role == PulseObjectRole) {
         return QVariant::fromValue(data);
     } else if (role == Qt::DisplayRole) {
         return static_cast<PulseObject*>(data)->properties().value(QStringLiteral("name")).toString();
     }
     int property = m_objectProperties.value(role, -1);
     if (property == -1) {
         return QVariant();
     }
     return data->metaObject()->property(property).read(data);
 }
 
 bool AbstractModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
     int propertyIndex = m_objectProperties.value(role, -1);
     if (propertyIndex == -1) {
         return false;
     }
     QObject *data = m_map->objectAt(index.row());
     auto property = data->metaObject()->property(propertyIndex);
     return property.write(data, value);
 }
 
 int AbstractModel::role(const QByteArray &roleName) const
 {
     qCDebug(PULSEAUDIOQT) << roleName << m_roles.key(roleName, -1);
     return m_roles.key(roleName, -1);
 }
 
 Context *AbstractModel::context() const
 {
     return Context::instance();
 }
 
 void AbstractModel::initRoleNames(const QMetaObject &qobjectMetaObject)
 {
     m_roles[PulseObjectRole] = QByteArrayLiteral("PulseObject");
 
     QMetaEnum enumerator;
     for (int i = 0; i < metaObject()->enumeratorCount(); ++i) {
         if (metaObject()->enumerator(i).name() == QLatin1String("ItemRole")) {
             enumerator = metaObject()->enumerator(i);
             break;
         }
     }
 
     for (int i = 0; i < enumerator.keyCount(); ++i) {
         // Clip the Role suffix and glue it in the hash.
         const int roleLength = 4;
         QByteArray key(enumerator.key(i));
         // Enum values must end in Role or the enum is crap
         Q_ASSERT(key.right(roleLength) == QByteArrayLiteral("Role"));
         key.chop(roleLength);
         m_roles[enumerator.value(i)] = key;
     }
 
     int maxEnumValue = -1;
     for (auto it = m_roles.constBegin(); it != m_roles.constEnd(); ++it) {
         if (it.key() > maxEnumValue) {
             maxEnumValue = it.key();
         }
     }
     Q_ASSERT(maxEnumValue != -1);
     auto mo = qobjectMetaObject;
     for (int i = 0; i < mo.propertyCount(); ++i) {
         QMetaProperty property = mo.property(i);
         QString name(property.name());
         name.replace(0, 1, name.at(0).toUpper());
         m_roles[++maxEnumValue] = name.toLatin1();
         m_objectProperties.insert(maxEnumValue, i);
         if (!property.hasNotifySignal()) {
             continue;
         }
         m_signalIndexToProperties.insert(property.notifySignalIndex(), i);
     }
     qCDebug(PULSEAUDIOQT) << m_roles;
 
     // Connect to property changes also with objects already in model
     for (int i = 0; i < m_map->count(); ++i) {
         onDataAdded(i);
     }
 }
 
 void AbstractModel::propertyChanged()
 {
     if (!sender() || senderSignalIndex() == -1) {
         return;
     }
     int propertyIndex = m_signalIndexToProperties.value(senderSignalIndex(), -1);
     if (propertyIndex == -1) {
         return;
     }
     int role = m_objectProperties.key(propertyIndex, -1);
     if (role == -1) {
         return;
     }
     int index = m_map->indexOfObject(sender());
     qCDebug(PULSEAUDIOQT) << "PROPERTY CHANGED (" << index << ") :: " << role << roleNames().value(role);
     Q_EMIT dataChanged(createIndex(index, 0), createIndex(index, 0), {role});
 }
 
 void AbstractModel::onDataAdded(int index)
 {
     QObject *data = m_map->objectAt(index);
     const QMetaObject *mo = data->metaObject();
     // We have all the data changed notify signals already stored
     auto keys = m_signalIndexToProperties.keys();
     foreach (int index, keys) {
         QMetaMethod meth = mo->method(index);
         connect(data, meth, this, propertyChangedMetaMethod());
     }
 }
 
 QMetaMethod AbstractModel::propertyChangedMetaMethod() const
 {
     auto mo = metaObject();
     int methodIndex = mo->indexOfMethod("propertyChanged()");
     if (methodIndex == -1) {
         return QMetaMethod();
     }
     return mo->method(methodIndex);
 }
 
 SinkModel::SinkModel(QObject *parent)
     : AbstractModel(&context()->d->m_sinks, parent)
     , m_preferredSink(nullptr)
 {
     initRoleNames(Sink::staticMetaObject);
 
     for (int i = 0; i < context()->d->m_sinks.count(); ++i) {
         sinkAdded(i);
     }
 
     connect(&context()->d->m_sinks, &MapBaseQObject::added, this, &SinkModel::sinkAdded);
     connect(&context()->d->m_sinks, &MapBaseQObject::removed, this, &SinkModel::sinkRemoved);
 
     connect(context()->server(), &Server::defaultSinkChanged, this, [this]() {
         updatePreferredSink();
         Q_EMIT defaultSinkChanged();
     });
 }
 
 Sink *SinkModel::defaultSink() const
 {
     return context()->server()->defaultSink();
 }
 
 Sink *SinkModel::preferredSink() const
 {
     return m_preferredSink;
 }
 
 QVariant SinkModel::data(const QModelIndex &index, int role) const
 {
     if (role == SortByDefaultRole) {
         // Workaround QTBUG-1548
         const QString pulseIndex = data(index, AbstractModel::role(QByteArrayLiteral("Index"))).toString();
         const QString defaultDevice = data(index, AbstractModel::role(QByteArrayLiteral("Default"))).toString();
         return defaultDevice + pulseIndex;
     }
     return AbstractModel::data(index, role);
 }
 
 void SinkModel::sinkAdded(int index)
 {
     Q_ASSERT(qobject_cast<Sink *>(context()->d->m_sinks.objectAt(index)));
     Sink *sink = static_cast<Sink *>(context()->d->m_sinks.objectAt(index));
     connect(sink, &Sink::stateChanged, this, &SinkModel::updatePreferredSink);
 
     updatePreferredSink();
 }
 
 void SinkModel::sinkRemoved(int index)
 {
     Q_UNUSED(index);
 
     updatePreferredSink();
 }
 
 void SinkModel::updatePreferredSink()
 {
     Sink *sink = findPreferredSink();
 
     if (sink != m_preferredSink) {
         qCDebug(PULSEAUDIOQT) << "Changing preferred sink to" << sink << (sink ? sink->name() : "");
         m_preferredSink = sink;
         Q_EMIT preferredSinkChanged();
     }
 }
 
 Sink *SinkModel::findPreferredSink() const
 {
     const auto &sinks = context()->d->m_sinks;
 
     // Only one sink is the preferred one
     if (sinks.count() == 1) {
         return static_cast<Sink *>(sinks.objectAt(0));
     }
 
     auto lookForState = [&](Device::State state) {
         Sink *ret = nullptr;
         const auto data = sinks.data();
         for (Sink *sink : data) {
             if (sink->state() != state) {
                 continue;
             }
             if (!ret) {
                 ret = sink;
             } else if (sink == defaultSink()) {
                 ret = sink;
                 break;
             }
         }
         return ret;
     };
 
     Sink *preferred = nullptr;
 
     // Look for playing sinks + prefer default sink
     preferred = lookForState(Device::RunningState);
     if (preferred) {
         return preferred;
     }
 
     // Look for idle sinks + prefer default sink
     preferred = lookForState(Device::IdleState);
     if (preferred) {
         return preferred;
     }
 
     // Fallback to default sink
     return defaultSink();
 }
 
 SourceModel::SourceModel(QObject *parent)
     : AbstractModel(&context()->d->m_sources, parent)
 {
     initRoleNames(Source::staticMetaObject);
 
     connect(context()->server(), &Server::defaultSourceChanged, this, &SourceModel::defaultSourceChanged);
 }
 
 Source *SourceModel::defaultSource() const
 {
     return context()->server()->defaultSource();
 }
 
 QVariant SourceModel::data(const QModelIndex &index, int role) const
 {
     if (role == SortByDefaultRole) {
         // Workaround QTBUG-1548
         const QString pulseIndex = data(index, AbstractModel::role(QByteArrayLiteral("Index"))).toString();
         const QString defaultDevice = data(index, AbstractModel::role(QByteArrayLiteral("Default"))).toString();
         return defaultDevice + pulseIndex;
     }
     return AbstractModel::data(index, role);
 }
 
 SinkInputModel::SinkInputModel(QObject *parent)
     : AbstractModel(&context()->d->m_sinkInputs, parent)
 {
     initRoleNames(SinkInput::staticMetaObject);
 }
 
 SourceOutputModel::SourceOutputModel(QObject *parent)
     : AbstractModel(&context()->d->m_sourceOutputs, parent)
 {
     initRoleNames(SourceOutput::staticMetaObject);
 }
 
 CardModel::CardModel(QObject *parent)
     : AbstractModel(&context()->d->m_cards, parent)
 {
     initRoleNames(Card::staticMetaObject);
 }
 
 StreamRestoreModel::StreamRestoreModel(QObject *parent)
     : AbstractModel(&context()->d->m_streamRestores, parent)
 {
     initRoleNames(StreamRestore::staticMetaObject);
 }
 
 ModuleModel::ModuleModel(QObject *parent)
     : AbstractModel(&context()->d->m_modules, parent)
 {
     initRoleNames(Module::staticMetaObject);
 }
 
 } // PulseAudioQt
diff --git a/src/pulseaudio.h b/src/pulseaudio.h
index d848f59..98208a2 100644
--- a/src/pulseaudio.h
+++ b/src/pulseaudio.h
@@ -1,158 +1,161 @@
 /*
     Copyright 2014-2015 Harald Sitter <sitter@kde.org>
     Copyright 2016 David Rosca <nowrep@gmail.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
     version 2.1 of the License, or (at your option) version 3, or any
     later version accepted by the membership of KDE e.V. (or its
     successor approved by the membership of KDE e.V.), which shall
     act as a proxy defined in Section 6 of version 3 of the license.
 
     This library 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
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef PULSEAUDIO_H
 #define PULSEAUDIO_H
 
 #include <QAbstractListModel>
 
-#include "maps.h"
 #include "kf5pulseaudioqt_export.h"
 
 namespace PulseAudioQt
 {
-    class Context;
+
+class Context;
+class MapBaseQObject;
+class Sink;
+class Source;
 
 class KF5PULSEAUDIOQT_EXPORT AbstractModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
     enum ItemRole {
         PulseObjectRole = Qt::UserRole + 1
     };
 
     ~AbstractModel() override;
     QHash<int, QByteArray> roleNames() const Q_DECL_FINAL;
     int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_FINAL;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
     bool setData(const QModelIndex &index, const QVariant &value, int role) Q_DECL_FINAL;
 
     Q_INVOKABLE int role(const QByteArray &roleName) const;
 
 protected:
     AbstractModel(const MapBaseQObject *map, QObject *parent);
     void initRoleNames(const QMetaObject &qobjectMetaObject);
     Context *context() const;
 
 private Q_SLOTS:
     void propertyChanged();
 
 private:
     void onDataAdded(int index);
     void onDataRemoved(int index);
     QMetaMethod propertyChangedMetaMethod() const;
 
     const MapBaseQObject *m_map;
     QHash<int, QByteArray> m_roles;
     QHash<int, int> m_objectProperties;
     QHash<int, int> m_signalIndexToProperties;
 
 private:
     // Prevent leaf-classes from default constructing as we want to enforce
     // them passing us a context or explicit nullptrs.
     AbstractModel() {}
 };
 
 class KF5PULSEAUDIOQT_EXPORT CardModel : public AbstractModel
 {
     Q_OBJECT
 public:
     CardModel(QObject *parent = nullptr);
 };
 
 class KF5PULSEAUDIOQT_EXPORT SinkModel : public AbstractModel
 {
     Q_OBJECT
     Q_PROPERTY(PulseAudioQt::Sink *defaultSink READ defaultSink NOTIFY defaultSinkChanged)
     Q_PROPERTY(PulseAudioQt::Sink *preferredSink READ preferredSink NOTIFY preferredSinkChanged)
 public:
     enum ItemRole {
         SortByDefaultRole = PulseObjectRole + 1
     };
     Q_ENUMS(ItemRole)
 
     SinkModel(QObject *parent = nullptr);
     Sink *defaultSink() const;
     Sink *preferredSink() const;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
     void defaultSinkChanged();
     void preferredSinkChanged();
 
 private:
     void sinkAdded(int index);
     void sinkRemoved(int index);
     void updatePreferredSink();
     Sink *findPreferredSink() const;
 
     Sink *m_preferredSink;
 };
 
 class KF5PULSEAUDIOQT_EXPORT SinkInputModel : public AbstractModel
 {
     Q_OBJECT
 public:
     SinkInputModel(QObject *parent = nullptr);
 };
 
 class KF5PULSEAUDIOQT_EXPORT SourceModel : public AbstractModel
 {
     Q_OBJECT
     Q_PROPERTY(PulseAudioQt::Source *defaultSource READ defaultSource NOTIFY defaultSourceChanged)
 public:
     enum ItemRole {
         SortByDefaultRole = PulseObjectRole + 1
     };
     Q_ENUMS(ItemRole)
 
     SourceModel(QObject *parent = nullptr);
     Source *defaultSource() const;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
     void defaultSourceChanged();
 };
 
 class KF5PULSEAUDIOQT_EXPORT SourceOutputModel : public AbstractModel
 {
     Q_OBJECT
 public:
     SourceOutputModel(QObject *parent = nullptr);
 };
 
 class KF5PULSEAUDIOQT_EXPORT StreamRestoreModel : public AbstractModel
 {
     Q_OBJECT
 public:
     StreamRestoreModel(QObject *parent = nullptr);
 };
 
 class KF5PULSEAUDIOQT_EXPORT ModuleModel : public AbstractModel
 {
     Q_OBJECT
 public:
     ModuleModel(QObject *parent = nullptr);
 };
 
 } // PulseAudioQt
 
 #endif // PULSEAUDIO_H