diff --git a/src/core/DatabaseIcons.cpp b/src/core/DatabaseIcons.cpp
index 90fa558ab..3bdb37de6 100644
--- a/src/core/DatabaseIcons.cpp
+++ b/src/core/DatabaseIcons.cpp
@@ -15,9 +15,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config-keepassx.h"
 #include "DatabaseIcons.h"
 
+#include "config-keepassx.h"
+
 DatabaseIcons* DatabaseIcons::m_instance(0);
 
 QIcon DatabaseIcons::icon(int index)
diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp
index ff6938932..ac47a2fc3 100644
--- a/src/core/Entry.cpp
+++ b/src/core/Entry.cpp
@@ -17,10 +17,10 @@
 
 #include "Entry.h"
 
-#include "Database.h"
-#include "DatabaseIcons.h"
-#include "Group.h"
-#include "Metadata.h"
+#include "core/Database.h"
+#include "core/DatabaseIcons.h"
+#include "core/Group.h"
+#include "core/Metadata.h"
 
 const QStringList Entry::m_defaultAttibutes(QStringList() << "Title" << "URL" << "UserName" << "Password" << "Notes");
 
diff --git a/src/core/Entry.h b/src/core/Entry.h
index b4a06051e..248bb71a4 100644
--- a/src/core/Entry.h
+++ b/src/core/Entry.h
@@ -24,8 +24,8 @@
 #include <QtGui/QColor>
 #include <QtGui/QIcon>
 
-#include "TimeInfo.h"
-#include "Uuid.h"
+#include "core/TimeInfo.h"
+#include "core/Uuid.h"
 
 class Database;
 class Group;
diff --git a/src/core/Group.cpp b/src/core/Group.cpp
index 4e893caca..543cdb75c 100644
--- a/src/core/Group.cpp
+++ b/src/core/Group.cpp
@@ -20,8 +20,8 @@
 
 #include "Group.h"
 
-#include "DatabaseIcons.h"
-#include "Metadata.h"
+#include "core/DatabaseIcons.h"
+#include "core/Metadata.h"
 
 Group::Group()
 {
diff --git a/src/core/Group.h b/src/core/Group.h
index 4b49563d0..54febf9ce 100644
--- a/src/core/Group.h
+++ b/src/core/Group.h
@@ -20,10 +20,10 @@
 
 #include <QtGui/QIcon>
 
-#include "Database.h"
-#include "Entry.h"
-#include "TimeInfo.h"
-#include "Uuid.h"
+#include "core/Database.h"
+#include "core/Entry.h"
+#include "core/TimeInfo.h"
+#include "core/Uuid.h"
 
 class Group : public QObject
 {
diff --git a/src/core/Metadata.cpp b/src/core/Metadata.cpp
index a766a8fb3..1e34d6143 100644
--- a/src/core/Metadata.cpp
+++ b/src/core/Metadata.cpp
@@ -17,7 +17,7 @@
 
 #include "Metadata.h"
 
-#include "Database.h"
+#include "core/Database.h"
 
 Metadata::Metadata(Database* parent)
     : QObject(parent)
diff --git a/src/core/Metadata.h b/src/core/Metadata.h
index 00484cf52..39faed157 100644
--- a/src/core/Metadata.h
+++ b/src/core/Metadata.h
@@ -18,12 +18,12 @@
 #ifndef KEEPASSX_METADATA_H
 #define KEEPASSX_METADATA_H
 
-#include "Uuid.h"
-
 #include <QtCore/QDateTime>
 #include <QtCore/QHash>
 #include <QtGui/QIcon>
 
+#include "core/Uuid.h"
+
 class Database;
 class Group;
 
diff --git a/src/crypto/CryptoHash.cpp b/src/crypto/CryptoHash.cpp
index e216dbddf..5c56a3a74 100644
--- a/src/crypto/CryptoHash.cpp
+++ b/src/crypto/CryptoHash.cpp
@@ -17,7 +17,7 @@
 
 #include "CryptoHash.h"
 
-#include "gcrypt.h"
+#include <gcrypt.h>
 
 class CryptoHashPrivate
 {
diff --git a/src/crypto/SymmetricCipher.cpp b/src/crypto/SymmetricCipher.cpp
index ecbb19887..2bc0327f0 100644
--- a/src/crypto/SymmetricCipher.cpp
+++ b/src/crypto/SymmetricCipher.cpp
@@ -17,8 +17,8 @@
 
 #include "SymmetricCipher.h"
 
-#include "SymmetricCipherGcrypt.h"
-#include "SymmetricCipherSalsa20.h"
+#include "crypto/SymmetricCipherGcrypt.h"
+#include "crypto/SymmetricCipherSalsa20.h"
 
 SymmetricCipher::SymmetricCipher(SymmetricCipher::Algorithm algo, SymmetricCipher::Mode mode,
                                  SymmetricCipher::Direction direction, const QByteArray& key, const QByteArray& iv)
diff --git a/src/crypto/SymmetricCipherBackend.h b/src/crypto/SymmetricCipherBackend.h
index 4b9467e67..bca002e22 100644
--- a/src/crypto/SymmetricCipherBackend.h
+++ b/src/crypto/SymmetricCipherBackend.h
@@ -18,7 +18,7 @@
 #ifndef KEEPASSX_SYMMETRICCIPHERBACKEND_H
 #define KEEPASSX_SYMMETRICCIPHERBACKEND_H
 
-#include "SymmetricCipher.h"
+#include "crypto/SymmetricCipher.h"
 
 class SymmetricCipherBackend
 {
diff --git a/src/crypto/SymmetricCipherGcrypt.h b/src/crypto/SymmetricCipherGcrypt.h
index 6ac0d1173..aeaca6e57 100644
--- a/src/crypto/SymmetricCipherGcrypt.h
+++ b/src/crypto/SymmetricCipherGcrypt.h
@@ -18,10 +18,10 @@
 #ifndef KEEPASSX_SYMMETRICCIPHERGCRYPT_H
 #define KEEPASSX_SYMMETRICCIPHERGCRYPT_H
 
-#include "SymmetricCipherBackend.h"
-
 #include <gcrypt.h>
 
+#include "crypto/SymmetricCipherBackend.h"
+
 class SymmetricCipherGcrypt : public SymmetricCipherBackend
 {
 public:
diff --git a/src/crypto/SymmetricCipherSalsa20.h b/src/crypto/SymmetricCipherSalsa20.h
index af31c329e..872363b84 100644
--- a/src/crypto/SymmetricCipherSalsa20.h
+++ b/src/crypto/SymmetricCipherSalsa20.h
@@ -18,8 +18,8 @@
 #ifndef KEEPASSX_SYMMETRICCIPHERSALSA20_H
 #define KEEPASSX_SYMMETRICCIPHERSALSA20_H
 
-#include "SymmetricCipherBackend.h"
-#include "salsa20/ecrypt-sync.h"
+#include "crypto/SymmetricCipherBackend.h"
+#include "crypto/salsa20/ecrypt-sync.h"
 
 class SymmetricCipherSalsa20 : public SymmetricCipherBackend
 {
diff --git a/src/format/KeePass2RandomStream.cpp b/src/format/KeePass2RandomStream.cpp
index fc246a784..0cf4a1f46 100644
--- a/src/format/KeePass2RandomStream.cpp
+++ b/src/format/KeePass2RandomStream.cpp
@@ -17,8 +17,8 @@
 
 #include "KeePass2RandomStream.h"
 
-#include "format/KeePass2.h"
 #include "crypto/CryptoHash.h"
+#include "format/KeePass2.h"
 
 KeePass2RandomStream::KeePass2RandomStream(QByteArray key)
     : m_cipher(SymmetricCipher::Salsa20, SymmetricCipher::Stream, SymmetricCipher::Encrypt,
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index d1d2a81ee..89a5f6810 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -20,9 +20,9 @@
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QSplitter>
 
-#include "EditEntryWidget.h"
-#include "EntryView.h"
-#include "GroupView.h"
+#include "gui/EditEntryWidget.h"
+#include "gui/EntryView.h"
+#include "gui/GroupView.h"
 
 DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
     : QStackedWidget(parent)
diff --git a/src/gui/EntryView.cpp b/src/gui/EntryView.cpp
index b041c1848..e2d216d77 100644
--- a/src/gui/EntryView.cpp
+++ b/src/gui/EntryView.cpp
@@ -17,7 +17,7 @@
 
 #include "EntryView.h"
 
-#include "EntryModel.h"
+#include "gui/EntryModel.h"
 
 EntryView::EntryView(QWidget* parent)
     : QTreeView(parent)
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 087123a42..17ab64018 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -17,9 +17,9 @@
 
 #include "MainWindow.h"
 
-#include "DatabaseWidget.h"
 #include "core/Database.h"
 #include "core/Metadata.h"
+#include "gui/DatabaseWidget.h"
 
 MainWindow::MainWindow()
 {
diff --git a/src/keys/CompositeKey.h b/src/keys/CompositeKey.h
index 0d7c4a8a1..14baaf7dd 100644
--- a/src/keys/CompositeKey.h
+++ b/src/keys/CompositeKey.h
@@ -20,7 +20,7 @@
 
 #include <QtCore/QList>
 
-#include "Key.h"
+#include "keys/Key.h"
 
 class CompositeKey : public Key
 {
diff --git a/src/keys/PasswordKey.h b/src/keys/PasswordKey.h
index 6d32d560e..7bdc87f37 100644
--- a/src/keys/PasswordKey.h
+++ b/src/keys/PasswordKey.h
@@ -20,7 +20,7 @@
 
 #include <QtCore/QString>
 
-#include "Key.h"
+#include "keys/Key.h"
 
 class PasswordKey : public Key
 {
diff --git a/src/streams/HashedBlockStream.h b/src/streams/HashedBlockStream.h
index fc20ce14f..75940d3c7 100644
--- a/src/streams/HashedBlockStream.h
+++ b/src/streams/HashedBlockStream.h
@@ -20,7 +20,7 @@
 
 #include <QtCore/QSysInfo>
 
-#include "LayeredStream.h"
+#include "streams/LayeredStream.h"
 
 class HashedBlockStream : public LayeredStream
 {
diff --git a/src/streams/SymmetricCipherStream.h b/src/streams/SymmetricCipherStream.h
index 186bd1200..d4eee2e42 100644
--- a/src/streams/SymmetricCipherStream.h
+++ b/src/streams/SymmetricCipherStream.h
@@ -20,8 +20,8 @@
 
 #include <QtCore/QByteArray>
 
-#include "LayeredStream.h"
 #include "crypto/SymmetricCipher.h"
+#include "streams/LayeredStream.h"
 
 class SymmetricCipherStream : public LayeredStream
 {
diff --git a/utils/kdbx-extract.cpp b/utils/kdbx-extract.cpp
index a35a571ed..44abfc4c0 100644
--- a/utils/kdbx-extract.cpp
+++ b/utils/kdbx-extract.cpp
@@ -16,6 +16,7 @@
  */
 
 #include <stdio.h>
+
 #include <QtCore/QCoreApplication>
 #include <QtCore/QFile>
 #include <QtCore/QStringList>