diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 1b4c7cc66..b4f623155 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -634,7 +634,7 @@ void DatabaseWidget::setCurrentWidget(QWidget* widget)
 void DatabaseWidget::csvImportFinished(bool accepted)
 {
     if (!accepted) {
-        Q_EMIT closeRequest();
+        emit closeRequest();
     }
     else {
         setCurrentWidget(m_mainWidget);
diff --git a/src/gui/csvImport/CsvImportWidget.h b/src/gui/csvImport/CsvImportWidget.h
index 2079e9f96..aa463c08b 100644
--- a/src/gui/csvImport/CsvImportWidget.h
+++ b/src/gui/csvImport/CsvImportWidget.h
@@ -45,10 +45,10 @@ public:
     ~CsvImportWidget();
     void load(const QString& filename, Database* const db);
 
-Q_SIGNALS:
+signals:
     void editFinished(bool accepted);
 
-private Q_SLOTS:
+private slots:
     void parse();
     void comboChanged(int comboId);
     void skippedChanged(int rows);
diff --git a/src/gui/csvImport/CsvImportWizard.h b/src/gui/csvImport/CsvImportWizard.h
index 75d10bb9d..1c99259cd 100644
--- a/src/gui/csvImport/CsvImportWizard.h
+++ b/src/gui/csvImport/CsvImportWizard.h
@@ -38,10 +38,10 @@ public:
     ~CsvImportWizard();
     void load(const QString& filename, Database *database);
 
-Q_SIGNALS:
+signals:
     void importFinished(bool accepted);
 
-private Q_SLOTS:
+private slots:
     void keyFinished(bool accepted);
     void parseFinished(bool accepted);
 
diff --git a/src/gui/csvImport/CsvParserModel.h b/src/gui/csvImport/CsvParserModel.h
index ff4f410d7..8cab4d4ff 100644
--- a/src/gui/csvImport/CsvParserModel.h
+++ b/src/gui/csvImport/CsvParserModel.h
@@ -43,7 +43,7 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
 
-public Q_SLOTS:
+public slots:
     void setSkippedRows(int skipped);
 
 private:
diff --git a/src/http/OptionDialog.ui b/src/http/OptionDialog.ui
index abe994772..1959f8052 100644
--- a/src/http/OptionDialog.ui
+++ b/src/http/OptionDialog.ui
@@ -39,7 +39,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
diff --git a/src/keys/drivers/YubiKey.h b/src/keys/drivers/YubiKey.h
index 47341f9a2..8a7552136 100644
--- a/src/keys/drivers/YubiKey.h
+++ b/src/keys/drivers/YubiKey.h
@@ -77,7 +77,7 @@ public:
      */
     void detect();
 
-Q_SIGNALS:
+signals:
     /** Emitted in response to detect() when a device is found
      *
      * @slot is the slot number detected
diff --git a/tests/TestCsvParser.h b/tests/TestCsvParser.h
index 928ac4201..0aa3d01ef 100644
--- a/tests/TestCsvParser.h
+++ b/tests/TestCsvParser.h
@@ -32,7 +32,7 @@ class TestCsvParser : public QObject
 
 public:
 
-private Q_SLOTS:
+private slots:
     void init();
     void cleanup();
     void initTestCase();
diff --git a/tests/TestYkChallengeResponseKey.h b/tests/TestYkChallengeResponseKey.h
index 4699b9101..309e014d5 100644
--- a/tests/TestYkChallengeResponseKey.h
+++ b/tests/TestYkChallengeResponseKey.h
@@ -26,7 +26,7 @@ class TestYubiKeyChalResp: public QObject
 {
     Q_OBJECT
 
-private Q_SLOTS:
+private slots:
     void initTestCase();
     void cleanupTestCase();