diff --git a/smsapp/conversationlistmodel.h b/smsapp/conversationlistmodel.h
index 833b9299..e75fd169 100644
--- a/smsapp/conversationlistmodel.h
+++ b/smsapp/conversationlistmodel.h
@@ -1,118 +1,116 @@
 /*
  * This file is part of KDE Telepathy Chat
  *
  * Copyright (C) 2018 Aleix Pol Gonzalez <aleixpol@kde.org>
  *
  * 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) any later version.
  *
  * 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, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef CONVERSATIONLISTMODEL_H
 #define CONVERSATIONLISTMODEL_H
 
 #include <QStandardItemModel>
 #include <QLoggingCategory>
 #include <QQmlParserStatus>
 #include <KPeople/kpeople/personsmodel.h>
 #include <KPeople/kpeople/persondata.h>
 
 #include "interfaces/conversationmessage.h"
 #include "interfaces/dbusinterfaces.h"
 
-#include "interfaces/kdeconnectinterfaces_export.h"
-
 Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_SMS_CONVERSATIONS_LIST_MODEL)
 
 
 class OurSortFilterProxyModel : public QSortFilterProxyModel, public QQmlParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(Qt::SortOrder sortOrder READ sortOrder WRITE setSortOrder)
 public:
 
     Qt::SortOrder sortOrder() const { return m_sortOrder; }
     void setSortOrder(Qt::SortOrder sortOrder) {
         if (m_sortOrder != sortOrder) {
             m_sortOrder = sortOrder;
             sortNow();
         }
     }
     void classBegin() override {}
     void componentComplete() override {
         m_completed = true;
         sortNow();
     }
 
 private:
     void sortNow() {
         if (m_completed && dynamicSortFilter())
             sort(0, m_sortOrder);
     }
 
     bool m_completed = false;
     Qt::SortOrder m_sortOrder = Qt::AscendingOrder;
 };
 
-class KDECONNECTINTERFACES_EXPORT ConversationListModel
+class ConversationListModel
     : public QStandardItemModel
 {
     Q_OBJECT
     Q_PROPERTY(QString deviceId READ deviceId WRITE setDeviceId)
 
 public:
     ConversationListModel(QObject* parent = nullptr);
     ~ConversationListModel();
 
     enum Roles {
         FromMeRole = Qt::UserRole,
         PersonUriRole,
         AddressRole,
         ConversationIdRole,
         DateRole,
     };
     Q_ENUM(Roles)
 
     QString deviceId() const { return m_deviceId; }
     void setDeviceId(const QString &/*deviceId*/);
 
 public Q_SLOTS:
     void handleCreatedConversation(const QString& conversationId);
     void createRowFromMessage(const QVariantMap& message, int row);
     void printDBusError(const QDBusError& error);
 
 private:
     /**
      * Get all conversations currently known by the conversationsInterface, if any
      */
     void prepareConversationsList();
 
     /**
      * Get the data for a particular person given their contact address
      */
     KPeople::PersonData* lookupPersonByAddress(const QString& address);
 
     /**
      * Simplify a phone number to a known form
      */
     QString canonicalizePhoneNumber(const QString& phoneNumber);
 
     QStandardItem* conversationForThreadId(qint32 threadId);
 
     DeviceConversationsDbusInterface* m_conversationsInterface;
     QString m_deviceId;
     KPeople::PersonsModel m_people;
 };
 
 #endif // CONVERSATIONLISTMODEL_H
diff --git a/smsapp/conversationmodel.h b/smsapp/conversationmodel.h
index 85e25a60..3b316435 100644
--- a/smsapp/conversationmodel.h
+++ b/smsapp/conversationmodel.h
@@ -1,66 +1,64 @@
 /*
  * This file is part of KDE Telepathy Chat
  *
  * Copyright (C) 2018 Aleix Pol Gonzalez <aleixpol@kde.org>
  *
  * 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) any later version.
  *
  * 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, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef CONVERSATIONMODEL_H
 #define CONVERSATIONMODEL_H
 
 #include <QStandardItemModel>
 #include <QLoggingCategory>
 
 #include "interfaces/dbusinterfaces.h"
 
-#include "interfaces/kdeconnectinterfaces_export.h"
-
 Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_SMS_CONVERSATION_MODEL)
 
-class KDECONNECTINTERFACES_EXPORT ConversationModel
+class ConversationModel
     : public QStandardItemModel
 {
     Q_OBJECT
     Q_PROPERTY(QString threadId READ threadId WRITE setThreadId)
     Q_PROPERTY(QString deviceId READ deviceId WRITE setDeviceId)
 
 public:
     ConversationModel(QObject* parent = nullptr);
     ~ConversationModel();
 
     enum Roles {
         FromMeRole = Qt::UserRole,
         DateRole,
     };
 
     QString threadId() const;
     void setThreadId(const QString &threadId);
 
     QString deviceId() const { return m_deviceId; }
     void setDeviceId(const QString &/*deviceId*/);
 
     Q_INVOKABLE void sendReplyToConversation(const QString& message);
 
 private Q_SLOTS:
     void createRowFromMessage(const QVariantMap &msg, int pos);
 
 private:
     DeviceConversationsDbusInterface* m_conversationsInterface;
     QString m_deviceId;
     QString m_threadId;
 };
 
 #endif // CONVERSATIONMODEL_H