diff --git a/src/core/EntryAttachments.h b/src/core/EntryAttachments.h
index 19482e0a..960cc4ea 100644
--- a/src/core/EntryAttachments.h
+++ b/src/core/EntryAttachments.h
@@ -19,7 +19,7 @@
 #define KEEPASSX_ENTRYATTACHMENTS_H
 
 #include <QtCore/QMap>
-#include <QtCore/QSet>
+#include <QtCore/QObject>
 
 class EntryAttachments : public QObject
 {
diff --git a/src/format/KeePass2Writer.cpp b/src/format/KeePass2Writer.cpp
index 4f17cb5c..295ffce9 100644
--- a/src/format/KeePass2Writer.cpp
+++ b/src/format/KeePass2Writer.cpp
@@ -18,6 +18,7 @@
 #include "KeePass2Writer.h"
 
 #include <QtCore/QFile>
+#include <QtCore/QIODevice>
 
 #include "core/Database.h"
 #include "core/Endian.h"
diff --git a/src/format/KeePass2Writer.h b/src/format/KeePass2Writer.h
index 2477468d..1d9dde41 100644
--- a/src/format/KeePass2Writer.h
+++ b/src/format/KeePass2Writer.h
@@ -18,12 +18,11 @@
 #ifndef KEEPASSX_KEEPASS2WRITER_H
 #define KEEPASSX_KEEPASS2WRITER_H
 
-#include <QtCore/QIODevice>
-
 #include "format/KeePass2.h"
 #include "keys/CompositeKey.h"
 
 class Database;
+class QIODevice;
 
 class KeePass2Writer
 {
diff --git a/src/format/KeePass2XmlReader.h b/src/format/KeePass2XmlReader.h
index f8cd1586..f75c6e86 100644
--- a/src/format/KeePass2XmlReader.h
+++ b/src/format/KeePass2XmlReader.h
@@ -27,7 +27,6 @@
 
 #include "core/TimeInfo.h"
 #include "core/Uuid.h"
-#include "crypto/SymmetricCipher.h"
 
 class Database;
 class Entry;
diff --git a/src/format/KeePass2XmlWriter.h b/src/format/KeePass2XmlWriter.h
index 14a5d83a..289ac474 100644
--- a/src/format/KeePass2XmlWriter.h
+++ b/src/format/KeePass2XmlWriter.h
@@ -29,7 +29,6 @@
 #include "core/TimeInfo.h"
 #include "core/Uuid.h"
 
-class Group;
 class KeePass2RandomStream;
 class Metadata;
 
diff --git a/src/gui/DatabaseOpenDialog.h b/src/gui/DatabaseOpenDialog.h
index 4f9cef71..a87fc8c6 100644
--- a/src/gui/DatabaseOpenDialog.h
+++ b/src/gui/DatabaseOpenDialog.h
@@ -21,8 +21,6 @@
 #include <QtCore/QScopedPointer>
 #include <QtGui/QDialog>
 
-#include "keys/CompositeKey.h"
-
 class Database;
 class QFile;
 
diff --git a/src/gui/DatabaseTabWidget.h b/src/gui/DatabaseTabWidget.h
index a49625f7..5d855d76 100644
--- a/src/gui/DatabaseTabWidget.h
+++ b/src/gui/DatabaseTabWidget.h
@@ -19,7 +19,6 @@
 #define KEEPASSX_DATABASETABWIDGET_H
 
 #include <QtCore/QHash>
-#include <QtCore/QObject>
 #include <QtGui/QTabWidget>
 
 #include "format/KeePass2Writer.h"
@@ -28,7 +27,6 @@
 class DatabaseWidget;
 class DatabaseOpenDialog;
 class QFile;
-class QTabWidget;
 
 struct DatabaseManagerStruct
 {
diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
index e612872e..ce218e9d 100644
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -18,6 +18,7 @@
 #ifndef KEEPASSX_DATABASEWIDGET_H
 #define KEEPASSX_DATABASEWIDGET_H
 
+#include <QtCore/QScopedPointer>
 #include <QtGui/QStackedWidget>
 
 class ChangeMasterKeyWidget;
diff --git a/src/gui/DialogyWidget.h b/src/gui/DialogyWidget.h
index 87260ac2..2d12f828 100644
--- a/src/gui/DialogyWidget.h
+++ b/src/gui/DialogyWidget.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_DIALOGYWIDGET_H
 #define KEEPASSX_DIALOGYWIDGET_H
 
-#include <QtGui/QWidget>
 #include <QtGui/QDialogButtonBox>
+#include <QtGui/QWidget>
 
 class DialogyWidget : public QWidget
 {
diff --git a/src/gui/EditWidget.h b/src/gui/EditWidget.h
index d1a6d134..3ae5d2c1 100644
--- a/src/gui/EditWidget.h
+++ b/src/gui/EditWidget.h
@@ -19,10 +19,11 @@
 #define KEEPASSX_EDITWIDGET_H
 
 #include <QtCore/QScopedPointer>
-#include <QtGui/QLabel>
 
 #include "gui/DialogyWidget.h"
 
+class QLabel;
+
 namespace Ui {
     class EditWidget;
 }
diff --git a/src/gui/EditWidgetIcons.h b/src/gui/EditWidgetIcons.h
index 795b184c..d529f85d 100644
--- a/src/gui/EditWidgetIcons.h
+++ b/src/gui/EditWidgetIcons.h
@@ -20,9 +20,9 @@
 
 #include <QtGui/QWidget>
 
-#include "core/Database.h"
-#include "core/Entry.h"
+#include "core/Uuid.h"
 
+class Database;
 class DefaultIconModel;
 class CustomIconModel;
 
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index 36a0a712..2d9961a5 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -27,6 +27,7 @@
 #include <QtGui/QStackedLayout>
 #include <QtGui/QMessageBox>
 
+#include "core/Database.h"
 #include "core/Entry.h"
 #include "core/Metadata.h"
 #include "core/Tools.h"
diff --git a/src/gui/entry/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h
index 6617bc1f..17b95fdd 100644
--- a/src/gui/entry/EditEntryWidget.h
+++ b/src/gui/entry/EditEntryWidget.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_EDITENTRYWIDGET_H
 #define KEEPASSX_EDITENTRYWIDGET_H
 
-#include <QtCore/QAbstractItemModel>
+#include <QtCore/QModelIndex>
 #include <QtCore/QScopedPointer>
 
 #include "gui/EditWidget.h"
diff --git a/src/gui/group/EditGroupWidget.h b/src/gui/group/EditGroupWidget.h
index 761869ff..8a8af615 100644
--- a/src/gui/group/EditGroupWidget.h
+++ b/src/gui/group/EditGroupWidget.h
@@ -20,8 +20,8 @@
 
 #include <QtCore/QScopedPointer>
 
-#include "gui/EditWidget.h"
 #include "core/Group.h"
+#include "gui/EditWidget.h"
 
 class EditWidgetIcons;