diff --git a/src/app/upgrade.h b/src/app/upgrade.h
index e9e0ae211..acd05ac3b 100644
--- a/src/app/upgrade.h
+++ b/src/app/upgrade.h
@@ -29,34 +29,34 @@
 #ifndef UPGRADE_H
 #define UPGRADE_H
 
+#include <libtorrent/bencode.hpp>
+#include <libtorrent/entry.hpp>
 #include <libtorrent/version.hpp>
+
 #if LIBTORRENT_VERSION_NUM >= 10100
 #include <libtorrent/bdecode.hpp>
-#endif
-#include <libtorrent/bencode.hpp>
-#include <libtorrent/entry.hpp>
-#if LIBTORRENT_VERSION_NUM < 10100
+#else
 #include <libtorrent/lazy_entry.hpp>
 #endif
 
-
 #include <QDir>
 #include <QFile>
+#include <QRegExp>
+#include <QString>
+
 #ifndef DISABLE_GUI
 #include <QMessageBox>
 #endif
-#include <QRegExp>
-#include <QString>
 #ifdef Q_OS_MAC
 #include <QSettings>
 #endif
 
 #include "base/logger.h"
+#include "base/preferences.h"
 #include "base/profile.h"
 #include "base/utils/fs.h"
 #include "base/utils/misc.h"
 #include "base/utils/string.h"
-#include "base/preferences.h"
 
 bool userAcceptsUpgrade()
 {
diff --git a/src/base/bittorrent/magneturi.cpp b/src/base/bittorrent/magneturi.cpp
index a3a7c8325..dcdcb7495 100644
--- a/src/base/bittorrent/magneturi.cpp
+++ b/src/base/bittorrent/magneturi.cpp
@@ -26,16 +26,17 @@
  * exception statement from your version.
  */
 
-#include <QByteArray>
-#include <QRegExp>
-#include <QStringList>
+#include "magneturi.h"
 
 #include <libtorrent/bencode.hpp>
 #include <libtorrent/error_code.hpp>
 #include <libtorrent/magnet_uri.hpp>
 
+#include <QByteArray>
+#include <QRegExp>
+#include <QStringList>
+
 #include "base/utils/string.h"
-#include "magneturi.h"
 
 namespace
 {
diff --git a/src/base/http/connection.cpp b/src/base/http/connection.cpp
index a90cae331..1b98f3502 100644
--- a/src/base/http/connection.cpp
+++ b/src/base/http/connection.cpp
@@ -30,7 +30,6 @@
 
 #include "connection.h"
 
-#include <QRegExp>
 #include <QTcpSocket>
 
 #include "base/logger.h"
diff --git a/src/base/net/dnsupdater.cpp b/src/base/net/dnsupdater.cpp
index 7710befa9..68f45a037 100644
--- a/src/base/net/dnsupdater.cpp
+++ b/src/base/net/dnsupdater.cpp
@@ -26,6 +26,8 @@
  * exception statement from your version.
  */
 
+#include "dnsupdater.h"
+
 #include <QDebug>
 #include <QRegExp>
 #include <QStringList>
@@ -34,7 +36,6 @@
 #include "base/logger.h"
 #include "base/net/downloadhandler.h"
 #include "base/net/downloadmanager.h"
-#include "dnsupdater.h"
 
 using namespace Net;
 
diff --git a/src/gui/loglistwidget.cpp b/src/gui/loglistwidget.cpp
index 59b3d906d..b08124572 100644
--- a/src/gui/loglistwidget.cpp
+++ b/src/gui/loglistwidget.cpp
@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2011  Christophe Dumez
+ * Copyright (C) 2011  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,17 +24,18 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
-#include <QKeyEvent>
+
+#include "loglistwidget.h"
+
+#include <QAction>
 #include <QApplication>
 #include <QClipboard>
-#include <QListWidgetItem>
+#include <QKeyEvent>
 #include <QLabel>
+#include <QListWidgetItem>
 #include <QRegExp>
-#include <QAction>
-#include "loglistwidget.h"
+
 #include "guiiconprovider.h"
 
 LogListWidget::LogListWidget(int maxLines, const Log::MsgTypes &types, QWidget *parent)
diff --git a/src/gui/programupdater.cpp b/src/gui/programupdater.cpp
index e2d8c0fc1..e504fac76 100644
--- a/src/gui/programupdater.cpp
+++ b/src/gui/programupdater.cpp
@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2010  Christophe Dumez
+ * Copyright (C) 2010  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,20 +24,19 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
-#include <QXmlStreamReader>
-#include <QDesktopServices>
+#include "programupdater.h"
+
 #include <QDebug>
+#include <QDesktopServices>
 #include <QRegExp>
 #include <QStringList>
+#include <QXmlStreamReader>
 
-#include "base/utils/fs.h"
-#include "base/net/downloadmanager.h"
 #include "base/net/downloadhandler.h"
-#include "programupdater.h"
+#include "base/net/downloadmanager.h"
+#include "base/utils/fs.h"
 
 namespace
 {
diff --git a/src/gui/search/searchwidget.cpp b/src/gui/search/searchwidget.cpp
index b44eb8b0c..f34976f86 100644
--- a/src/gui/search/searchwidget.cpp
+++ b/src/gui/search/searchwidget.cpp
@@ -29,6 +29,8 @@
 
 #include "searchwidget.h"
 
+#include <QtGlobal>
+
 #ifdef Q_OS_WIN
 #include <cstdlib>
 #endif
@@ -41,6 +43,7 @@
 #include <QMessageBox>
 #include <QMimeData>
 #include <QProcess>
+#include <QRegExp>
 #include <QSignalMapper>
 #include <QSortFilterProxyModel>
 #include <QStandardItemModel>
diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp
index 45cdc3eed..9b64b38f3 100644
--- a/src/gui/transferlistwidget.cpp
+++ b/src/gui/transferlistwidget.cpp
@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006  Christophe Dumez
+ * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,8 +24,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #include "transferlistwidget.h"
@@ -35,14 +33,13 @@
 #include <QFileDialog>
 #include <QMenu>
 #include <QMessageBox>
-#include <QStylePainter>
 #include <QRegExp>
 #include <QShortcut>
+#include <QStylePainter>
 #include <QTableView>
 #include <QWheelEvent>
 #include <QWidgetAction>
 
-#include "autoexpandabledialog.h"
 #include "base/bittorrent/session.h"
 #include "base/bittorrent/torrenthandle.h"
 #include "base/logger.h"
@@ -50,6 +47,7 @@
 #include "base/torrentfilter.h"
 #include "base/utils/fs.h"
 #include "base/utils/string.h"
+#include "autoexpandabledialog.h"
 #include "deletionconfirmationdlg.h"
 #include "guiiconprovider.h"
 #include "mainwindow.h"