diff --git a/src/accountlistmodel.h b/src/accountlistmodel.h
index 4dbdc3acf..a7c41a38b 100644
--- a/src/accountlistmodel.h
+++ b/src/accountlistmodel.h
@@ -35,7 +35,7 @@ private:
     Controller *m_controller = nullptr;
     QVector<Connection *> m_connections;
 
-signals:
+Q_SIGNALS: 
     void controllerChanged();
 };
 
diff --git a/src/controller.h b/src/controller.h
index 132dafe19..1397f3314 100644
--- a/src/controller.h
+++ b/src/controller.h
@@ -113,10 +113,10 @@ private:
     void loadSettings();
     void saveSettings() const;
 
-private slots:
+private Q_SLOTS:
     void invokeLogin();
 
-signals:
+Q_SIGNALS: 
     void busyChanged();
     void errorOccured(QString error, QString detail);
     void syncDone();
@@ -129,7 +129,7 @@ signals:
     void connectionChanged();
     void isOnlineChanged();
 
-public slots:
+public Q_SLOTS:
     void logout(Connection *conn);
     void joinRoom(Connection *c, const QString &alias);
     void createRoom(Connection *c, const QString &name, const QString &topic);
diff --git a/src/emojimodel.h b/src/emojimodel.h
index 07036e299..edc757ba1 100644
--- a/src/emojimodel.h
+++ b/src/emojimodel.h
@@ -70,10 +70,10 @@ public:
     Q_INVOKABLE QVariantList history();
     Q_INVOKABLE QVariantList filterModel(const QString &filter);
 
-signals:
+Q_SIGNALS: 
     void historyChanged();
 
-public slots:
+public Q_SLOTS:
     void emojiUsed(QVariant modelData);
 
 private:
diff --git a/src/imageclipboard.h b/src/imageclipboard.h
index 2f52ec35d..3d929481b 100644
--- a/src/imageclipboard.h
+++ b/src/imageclipboard.h
@@ -27,7 +27,7 @@ public:
 private:
     QClipboard *m_clipboard;
 
-signals:
+Q_SIGNALS: 
     void imageChanged();
 };
 
diff --git a/src/matriximageprovider.h b/src/matriximageprovider.h
index 56caf9aa1..a8dc1599a 100644
--- a/src/matriximageprovider.h
+++ b/src/matriximageprovider.h
@@ -28,7 +28,7 @@ public:
     ThumbnailResponse(Quotient::Connection *c, QString mediaId, const QSize &requestedSize);
     ~ThumbnailResponse() override = default;
 
-private slots:
+private Q_SLOTS:
     void startRequest();
     void prepareResult();
     void doCancel();
@@ -68,7 +68,7 @@ public:
         Q_EMIT connectionChanged();
     }
 
-signals:
+Q_SIGNALS: 
     void connectionChanged();
 
 private:
diff --git a/src/messageeventmodel.h b/src/messageeventmodel.h
index 4a67b5cc0..604f05760 100644
--- a/src/messageeventmodel.h
+++ b/src/messageeventmodel.h
@@ -62,7 +62,7 @@ public:
 
     Q_INVOKABLE int eventIDToIndex(const QString &eventID) const;
 
-private slots:
+private Q_SLOTS:
     int refreshEvent(const QString &eventId);
     void refreshRow(int row);
 
@@ -80,7 +80,7 @@ private:
     void refreshEventRoles(int row, const QVector<int> &roles = {});
     int refreshEventRoles(const QString &eventId, const QVector<int> &roles = {});
 
-signals:
+Q_SIGNALS: 
     void roomChanged();
 };
 
diff --git a/src/publicroomlistmodel.h b/src/publicroomlistmodel.h
index d84221fea..0a8446e7b 100644
--- a/src/publicroomlistmodel.h
+++ b/src/publicroomlistmodel.h
@@ -71,7 +71,7 @@ private:
 
     QueryPublicRoomsJob *job = nullptr;
 
-signals:
+Q_SIGNALS: 
     void connectionChanged();
     void serverChanged();
     void keywordChanged();
diff --git a/src/roomlistmodel.h b/src/roomlistmodel.h
index 68d3730b6..29efc6641 100644
--- a/src/roomlistmodel.h
+++ b/src/roomlistmodel.h
@@ -69,7 +69,7 @@ public:
         return m_notificationCount;
     }
 
-private slots:
+private Q_SLOTS:
     void doAddRoom(Room *room);
     void updateRoom(Room *room, Room *prev);
     void deleteRoom(Room *room);
@@ -84,7 +84,7 @@ private:
 
     void connectRoomSignals(SpectralRoom *room);
 
-signals:
+Q_SIGNALS: 
     void connectionChanged();
     void notificationCountChanged();
 
diff --git a/src/spectralroom.h b/src/spectralroom.h
index 2ae8a608c..4c3ef5fcf 100644
--- a/src/spectralroom.h
+++ b/src/spectralroom.h
@@ -95,17 +95,17 @@ private:
 
     static QString markdownToHTML(const QString &plaintext);
 
-private slots:
+private Q_SLOTS:
     void countChanged();
 
-signals:
+Q_SIGNALS: 
     void cachedInputChanged();
     void busyChanged();
     void hasFileUploadingChanged();
     void fileUploadingProgressChanged();
     void backgroundChanged();
 
-public slots:
+public Q_SLOTS:
     void uploadFile(const QUrl &url, const QString &body = "");
     void acceptInvitation();
     void forget();
diff --git a/src/trayicon.h b/src/trayicon.h
index 1f66665f4..59d06ade6 100644
--- a/src/trayicon.h
+++ b/src/trayicon.h
@@ -56,7 +56,7 @@ public:
     }
     void setIsOnline(bool online);
 
-signals:
+Q_SIGNALS: 
     void notificationCountChanged();
     void iconSourceChanged();
     void isOnlineChanged();
diff --git a/src/userdirectorylistmodel.h b/src/userdirectorylistmodel.h
index 38c1c1a43..8c3b6ae47 100644
--- a/src/userdirectorylistmodel.h
+++ b/src/userdirectorylistmodel.h
@@ -61,7 +61,7 @@ private:
 
     SearchUserDirectoryJob *job = nullptr;
 
-signals:
+Q_SIGNALS: 
     void connectionChanged();
     void keywordChanged();
     void limitedChanged();
diff --git a/src/userlistmodel.h b/src/userlistmodel.h
index 3f9d7394f..e0b652904 100644
--- a/src/userlistmodel.h
+++ b/src/userlistmodel.h
@@ -55,10 +55,10 @@ public:
 
     QHash<int, QByteArray> roleNames() const override;
 
-signals:
+Q_SIGNALS: 
     void roomChanged();
 
-private slots:
+private Q_SLOTS:
     void userAdded(Quotient::User *user);
     void userRemoved(Quotient::User *user);
     void refresh(Quotient::User *user, QVector<int> roles = {});