diff --git a/src/FindReplaceDialog.cpp b/src/FindReplaceDialog.cpp
index 300805dc..4a7ba171 100644
--- a/src/FindReplaceDialog.cpp
+++ b/src/FindReplaceDialog.cpp
@@ -1,5 +1,6 @@
 #include "FindReplaceDialog.h"
 #include "ui_FindReplaceDialog.h"
+#include "ExtendedScintilla.h"
 
 #include <QWhatsThis>
 
diff --git a/src/FindReplaceDialog.h b/src/FindReplaceDialog.h
index 97d9b53d..aea18ae4 100644
--- a/src/FindReplaceDialog.h
+++ b/src/FindReplaceDialog.h
@@ -1,11 +1,11 @@
 #ifndef FindReplaceDialog_H
 #define FindReplaceDialog_H
 
-#include <ExtendedScintilla.h>
-
 #include <QDialog>
 #include <QAbstractButton>
 
+class ExtendedScintilla;
+
 namespace Ui {
 class FindReplaceDialog;
 }
diff --git a/src/ImportCsvDialog.h b/src/ImportCsvDialog.h
index 546bdafb..cc402634 100644
--- a/src/ImportCsvDialog.h
+++ b/src/ImportCsvDialog.h
@@ -9,7 +9,6 @@
 
 class DBBrowserDB;
 class QCompleter;
-class QListWidgetItem;
 
 namespace Ui {
 class ImportCsvDialog;
diff --git a/src/PreferencesDialog.h b/src/PreferencesDialog.h
index 113afc5b..9b18cb68 100644
--- a/src/PreferencesDialog.h
+++ b/src/PreferencesDialog.h
@@ -7,7 +7,6 @@
 
 class QTreeWidgetItem;
 class QFrame;
-class QTableWidget;
 class QSslCertificate;
 class QAbstractButton;
 
diff --git a/src/RemoteDock.cpp b/src/RemoteDock.cpp
index ee108808..aaaabdda 100644
--- a/src/RemoteDock.cpp
+++ b/src/RemoteDock.cpp
@@ -1,4 +1,3 @@
-#include <QtNetwork/QSslCertificate>
 #include <QFileInfo>
 
 #include "RemoteDock.h"
diff --git a/src/Settings.cpp b/src/Settings.cpp
index 6b1ecf98..1679cb9c 100644
--- a/src/Settings.cpp
+++ b/src/Settings.cpp
@@ -1,5 +1,6 @@
 #include "Settings.h"
 
+#include <QApplication>
 #include <QDir>
 #include <QSettings>
 #include <QColor>
diff --git a/src/Settings.h b/src/Settings.h
index 579e5d8a..0c7fad85 100644
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -1,7 +1,6 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-#include <QApplication>
 #include <QHash>
 #include <QVariant>