diff --git a/src/controller.cpp b/src/controller.cpp
index 8ff25128b..f98262389 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -13,15 +13,14 @@
 #endif
 
 #include <QClipboard>
-#include <QFile>
-#include <QFileInfo>
-#include <QSysInfo>
 #include <QDebug>
 #include <QDir>
 #include <QElapsedTimer>
+#include <QFile>
 #include <QFileInfo>
 #include <QStandardPaths>
 #include <QStringBuilder>
+#include <QSysInfo>
 #include <QTimer>
 #include <QtGui/QCloseEvent>
 #include <QtGui/QDesktopServices>
diff --git a/src/imageclipboard.cpp b/src/imageclipboard.cpp
index f11e28451..75a7e35c3 100644
--- a/src/imageclipboard.cpp
+++ b/src/imageclipboard.cpp
@@ -5,11 +5,11 @@
  */
 #include "imageclipboard.h"
 
+#include <QDebug>
 #include <QDir>
 #include <QFileInfo>
 #include <QGuiApplication>
 #include <QUrl>
-#include <QDebug>
 
 ImageClipboard::ImageClipboard(QObject *parent)
     : QObject(parent)
diff --git a/src/matriximageprovider.cpp b/src/matriximageprovider.cpp
index a90bf03c7..41021c652 100644
--- a/src/matriximageprovider.cpp
+++ b/src/matriximageprovider.cpp
@@ -6,10 +6,10 @@
  */
 #include "matriximageprovider.h"
 
+#include <QDebug>
 #include <QDir>
 #include <QFileInfo>
 #include <QStandardPaths>
-#include <QDebug>
 #include <QThread>
 
 using Quotient::BaseJob;
diff --git a/src/roomlistmodel.cpp b/src/roomlistmodel.cpp
index 446c6cae3..b76b99d02 100644
--- a/src/roomlistmodel.cpp
+++ b/src/roomlistmodel.cpp
@@ -5,10 +5,10 @@
 
 #include "events/roomevent.h"
 
-#include <QStandardPaths>
-#include <QDebug>
 #include <QBrush>
 #include <QColor>
+#include <QDebug>
+#include <QStandardPaths>
 
 RoomListModel::RoomListModel(QObject *parent)
     : QAbstractListModel(parent)
diff --git a/src/userlistmodel.cpp b/src/userlistmodel.cpp
index cb0c3d53e..fa0c7e366 100644
--- a/src/userlistmodel.cpp
+++ b/src/userlistmodel.cpp
@@ -6,8 +6,8 @@
 
 #include "events/roompowerlevelsevent.h"
 
-#include <QElapsedTimer>
 #include <QDebug>
+#include <QElapsedTimer>
 #include <QPixmap>
 
 #include "spectraluser.h"
diff --git a/src/userlistmodel.h b/src/userlistmodel.h
index 4036f37e7..dd932d98d 100644
--- a/src/userlistmodel.h
+++ b/src/userlistmodel.h
@@ -3,8 +3,8 @@
 
 #include "room.h"
 
-#include <QObject>
 #include <QAbstractListModel>
+#include <QObject>
 
 namespace Quotient
 {