2 files changed, 1 insertions, 9 deletions
diff --git a/src/tools/messageserver/messageserver.cpp b/src/tools/messageserver/messageserver.cpp
index d5d5c8a9..3e445382 100644
--- a/src/tools/messageserver/messageserver.cpp
+++ b/src/tools/messageserver/messageserver.cpp
@@ -85,9 +85,7 @@ MessageServer::~MessageServer()
         qCDebug(lcMessaging) << "Unregistered messageserver from D-Bus";
     }
 
-#ifdef MESSAGESERVER_PLUGINS
     qDeleteAll(m_plugins);
-#endif
 }
 
 bool MessageServer::init()
@@ -161,14 +159,12 @@ bool MessageServer::init()
 
     emit handler->actionsListed(QMailActionDataList());
 
-#ifdef MESSAGESERVER_PLUGINS
     qCDebug(lcMessaging) << "Initiating messageserver plugins.";
     for (const QString &plugin : QMailMessageServerPluginFactory::keys()) {
         QMailMessageServerService *service = QMailMessageServerPluginFactory::createService(plugin);
         qCDebug(lcMessaging) << "service from" << plugin << "created.";
         m_plugins.append(service);
     }
-#endif
 
     return true;
 }
diff --git a/src/tools/messageserver/messageserver.h b/src/tools/messageserver/messageserver.h
index d21bd22b..06447e37 100644
--- a/src/tools/messageserver/messageserver.h
+++ b/src/tools/messageserver/messageserver.h
@@ -44,8 +44,6 @@
 class ServiceHandler;
 class QMailMessageServerService;
 
-typedef QMap<QMailMessage::MessageType, int> MessageCountMap;
-
 class MessageServer : public QObject
 {
     Q_OBJECT
@@ -64,6 +62,7 @@ public:
 
 signals:
     void messageCountUpdated();
+
 #if defined(Q_OS_UNIX)
 public slots:
     void handleSigHup(); // Qt signal handler for UNIX SIGHUP signal.
@@ -82,10 +81,7 @@ private:
     void readLogSettings() const;
 
     ServiceHandler *handler;
-
-#ifdef MESSAGESERVER_PLUGINS
     QList<QMailMessageServerService*> m_plugins;
-#endif
 
 #if defined(Q_OS_UNIX)
     static int sighupFd[2];