diff --git a/aboutdialog.cpp b/aboutdialog.cpp
index e214ebf28b8294e4b9588354b402d9f3407c25e0..4b202809aa51c896530385d370709f196d86c921 100644
--- a/aboutdialog.cpp
+++ b/aboutdialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/aboutdialog.h b/aboutdialog.h
index 838418f183013c12c87090861d59012f380a2650..83f64192699449e88fe3679bac25a757d4106fb2 100644
--- a/aboutdialog.h
+++ b/aboutdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef ABOUTDIALOG_H
-#define ABOUTDIALOG_H
+#pragma once
 
 #include <QDialog>
 
@@ -43,4 +42,3 @@ private:
     Ui::AboutDialog *ui;
 };
 
-#endif // ABOUTDIALOG_H
diff --git a/accountdetails.cpp b/accountdetails.cpp
index 5cafd9a0b2c07aeb66165d60aa7c480faaf91f78..67407e719a3d5a95b60a126eded6bcb4c85ce8f9 100644
--- a/accountdetails.cpp
+++ b/accountdetails.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/accountdetails.h b/accountdetails.h
index 1f4983b372e155c0cc1ed9a6d5eae624d61dff7e..06f1b97c1c1c1776d1fa4758bdd72fce34658a48 100644
--- a/accountdetails.h
+++ b/accountdetails.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef ACCOUNTDETAILS_H
-#define ACCOUNTDETAILS_H
+#pragma once
 
 #include <QWidget>
 #include <QMap>
@@ -71,4 +70,3 @@ private:
 
 };
 
-#endif // ACCOUNTDETAILS_H
diff --git a/accountserializationadapter.cpp b/accountserializationadapter.cpp
index ba6b2b771421f9f7abcad2c5e7448039bbaa4bde..727f7cced54e8cc3d67c1b9060981a0a3b383d46 100644
--- a/accountserializationadapter.cpp
+++ b/accountserializationadapter.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2015 by Savoir-Faire Linux                              *
+ *   Copyright (C) 2015 by Savoir-faire Linux                              *
  *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/accountserializationadapter.h b/accountserializationadapter.h
index 862c8f07a0a01551963c3b11d2bdd0587df600a1..c9659690d6181300b8d4b2591751b7844fba33f1 100644
--- a/accountserializationadapter.h
+++ b/accountserializationadapter.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2015 by Savoir-Faire Linux                              *
+ *   Copyright (C) 2015 by Savoir-faire Linux                              *
  *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,8 +15,8 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
-#ifndef ACCOUNTSERIALIZATIONADAPTER_H
-#define ACCOUNTSERIALIZATIONADAPTER_H
+
+#pragma once
 
 #include "typedefs.h"
 
@@ -42,4 +42,3 @@ public:
    virtual ~AccountSerializationAdapter();
 };
 
-#endif
\ No newline at end of file
diff --git a/accountstatedelegate.cpp b/accountstatedelegate.cpp
index f268cedaa39802c24b4a48107d100b9e0bb89866..7b51d7e6c9f7d720bbec05971ca61e7043decf5c 100644
--- a/accountstatedelegate.cpp
+++ b/accountstatedelegate.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/accountstatedelegate.h b/accountstatedelegate.h
index 9a50f04e9a071158d1b4bf01fb98bcb75cb30bdb..971fc3dc2be548c8bfb5ad0ec556594432f70850 100644
--- a/accountstatedelegate.h
+++ b/accountstatedelegate.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef ACCOUNTSTATEDELEGATE_H
-#define ACCOUNTSTATEDELEGATE_H
+#pragma once
 
 #include <QObject>
 #include <QString>
@@ -36,4 +35,3 @@ protected:
     QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
 };
 
-#endif // ACCOUNTSTATEDELEGATE_H
diff --git a/callwidget.cpp b/callwidget.cpp
index 2310c7adad07d71c1f9d8c99f0fbef10847558dd..06ef685311bc32e5236ce9abf66c4d8edfa5d086 100644
--- a/callwidget.cpp
+++ b/callwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/callwidget.h b/callwidget.h
index 81f5022bcf9c17be397c080d295117ee7a9f9a11..75e7b4581346c4ce7361d9420b2438cf65744768 100644
--- a/callwidget.h
+++ b/callwidget.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef CALLWIDGET_H
-#define CALLWIDGET_H
+#pragma once
 
 #include <QWidget>
 #include <QVector>
@@ -86,4 +85,3 @@ private:
     void displaySpinner(bool display);
 };
 
-#endif // CALLWIDGET_H
diff --git a/configurationwidget.cpp b/configurationwidget.cpp
index 23dc0ac9df7d840b0d3f723f1e7cb812153c9a52..a6912188c3efc692280bd78de6daef111afa23de 100644
--- a/configurationwidget.cpp
+++ b/configurationwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/configurationwidget.h b/configurationwidget.h
index debfd1fcc343c393bc3a2260f27444d72aa8f1d2..72222fb7f5b72d775be5ec75b48828b27ed44285 100644
--- a/configurationwidget.h
+++ b/configurationwidget.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef CONFIGURATIONWIDGET_H
-#define CONFIGURATIONWIDGET_H
+#pragma once
 
 #include <QWidget>
 #include <QItemSelection>
@@ -74,4 +73,3 @@ private:
     QSettings settings_;
 };
 
-#endif // CONFIGURATIONWIDGET_H
diff --git a/contactdelegate.cpp b/contactdelegate.cpp
index 009d1026dbd5bff941f5f95d150c177aae508fee..b94d53a23f45ffae17fafedb39bfd81490afe7d5 100644
--- a/contactdelegate.cpp
+++ b/contactdelegate.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/contactdelegate.h b/contactdelegate.h
index 30d857ae74ab5d152e065ae69968430d1b47d1a5..01976d1b51e6aca4200559d9cbb30bfa8946d9be 100644
--- a/contactdelegate.h
+++ b/contactdelegate.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef CONTACTDELEGATE_H
-#define CONTACTDELEGATE_H
+#pragma once
 
 #include <QObject>
 #include <QString>
@@ -39,4 +38,3 @@ private:
     constexpr static int sizeImage_ = 49;
 };
 
-#endif // CONTACTDELEGATE_H
diff --git a/contactmethodpicker.cpp b/contactmethodpicker.cpp
index 6a87e8f1432093f2b7ac23937657349337139035..3204623e549cba8ed1c6518e2a5c829458b713f8 100644
--- a/contactmethodpicker.cpp
+++ b/contactmethodpicker.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/contactmethodpicker.h b/contactmethodpicker.h
index 9f8fef716d5ca3ef0ff8acbd502d5e59a09e4541..356ee70883930a69c2dc499d361d1dd87bc236ba 100644
--- a/contactmethodpicker.h
+++ b/contactmethodpicker.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef CONTACTMETHODPICKER_H
-#define CONTACTMETHODPICKER_H
+#pragma once
 
 #include <QDialog>
 
@@ -48,4 +47,3 @@ private:
     int index_;
 };
 
-#endif // CONTACTMETHODPICKER_H
diff --git a/contactpicker.h b/contactpicker.h
index e1dab5a1b03124f9b6592eb8a526d44417a82a17..4d0938319d6b76246be435210e485db9e6f99072 100644
--- a/contactpicker.h
+++ b/contactpicker.h
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef CONTACTPICKER_H
-#define CONTACTPICKER_H
+#pragma once
 
 #include <QDialog>
 #include <QSortFilterProxyModel>
@@ -68,5 +67,3 @@ private:
     ContactMethod* number_;
     OnlyPersonProxyModel* contactProxyModel_;
 };
-
-#endif // CONTACTPICKER_H
diff --git a/globalsystemtray.h b/globalsystemtray.h
index 855414a1cfb76a76af3bfbc4963c264a17bdeba3..e087749fee7d35ee11982525a24338ef37dcb593 100644
--- a/globalsystemtray.h
+++ b/globalsystemtray.h
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef GLOBALSYSTEMTRAY_H
-#define GLOBALSYSTEMTRAY_H
+#pragma once
 
 #include <QSystemTrayIcon>
 
@@ -37,4 +36,3 @@ private:
     GlobalSystemTray();
 };
 
-#endif // GLOBALSYSTEMTRAY_H
diff --git a/historydelegate.cpp b/historydelegate.cpp
index 7632e99fee8025438a82c889fbab7bbbd537408a..79ed77d266f0ad94b43722193e4ebab7d75b0b3a 100644
--- a/historydelegate.cpp
+++ b/historydelegate.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/historydelegate.h b/historydelegate.h
index 0056c8913cf7e2656d74d0cbfb21af4cbd5713a9..24325995354536a7ab73450176fc5414cc3e1a93 100644
--- a/historydelegate.h
+++ b/historydelegate.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef HISTORYDELEGATE_H
-#define HISTORYDELEGATE_H
+#pragma once
 
 #include <QObject>
 #include <QString>
@@ -41,4 +40,3 @@ private:
     constexpr static int imgSize_ = 25;
 };
 
-#endif // HISTORYDELEGATE_H
diff --git a/imdelegate.cpp b/imdelegate.cpp
index 9ba05a7ece1acfbb0b8e89e600ec7971a3470d4e..2fbbc370d39594d57ab7f2a8ffe6a9fe4e779348 100644
--- a/imdelegate.cpp
+++ b/imdelegate.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/imdelegate.h b/imdelegate.h
index 00986112a365e328d22176f4f84bdeb3941765d0..dad68acf74d9b790a5593e53f9ab2d46561cc6bc 100644
--- a/imdelegate.h
+++ b/imdelegate.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef IMDELEGATE_H
-#define IMDELEGATE_H
+#pragma once
 
 #include <QObject>
 #include <QApplication>
@@ -44,4 +43,3 @@ private:
     bool showAuthor_;
 };
 
-#endif // IMDELEGATE_H
diff --git a/instantmessagingwidget.cpp b/instantmessagingwidget.cpp
index d186a108babe7a2d0c3f1fc63a3316610cec4ea1..34f55d305f6ae97fb3cf36603d0910bbb24166cf 100644
--- a/instantmessagingwidget.cpp
+++ b/instantmessagingwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/instantmessagingwidget.h b/instantmessagingwidget.h
index 8220b1c55c2a70eea377e5bf6e4da6029dbe93ce..8bf6455b504de6f0a6e828037c07af6c94d23ac8 100644
--- a/instantmessagingwidget.h
+++ b/instantmessagingwidget.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef INSTANTMESSAGINGWIDGET_H
-#define INSTANTMESSAGINGWIDGET_H
+#pragma once
 
 #include <QWidget>
 #include <QKeyEvent>
@@ -60,4 +59,3 @@ private:
     void copyToClipboard();
 };
 
-#endif // INSTANTMESSAGINGWIDGET_H
diff --git a/mainbar.cpp b/mainbar.cpp
index 70d5d1e16dd6a31b32c20f063db163dcd7d07220..4a0b231552b9219cc8ddff530d1d0cd30120d05d 100644
--- a/mainbar.cpp
+++ b/mainbar.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/mainbar.h b/mainbar.h
index bbc9932e6d910888b67cbb0a376915559fd3d7ca..0f510a930a6fbf5a729790fb65166bc9fd3b5257 100644
--- a/mainbar.h
+++ b/mainbar.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,9 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-
-#ifndef MAINBAR_H
-#define MAINBAR_H
+#pragma once
 
 #include <QWidget>
 #include <QMenu>
@@ -58,4 +56,3 @@ signals:
     void minimize();
 };
 
-#endif // MAINBAR_H
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9cd507c70c2990bc11ae330a51e39d167eff44ae..dd7957bb64c1eb9d26c82b591766a097e8798775 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/mainwindow.h b/mainwindow.h
index 50b05d3105947200f87f153b9241b50503affc7e..c13de7bbf81e75a7f1ac9881374c0f167e21ef2c 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
+#pragma once
 
 #include "globalsystemtray.h"
 
@@ -52,4 +51,3 @@ protected:
     void mouseMoveEvent(QMouseEvent *evt);
 };
 
-#endif // MAINWINDOW_H
diff --git a/navbar.cpp b/navbar.cpp
index a51dd614fa1e947b861e9ee0242efa9d007dbfdc..69ad220fef530f590e10140fcd68e590418c8698 100644
--- a/navbar.cpp
+++ b/navbar.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/navbar.h b/navbar.h
index 58b9bbe82f8404d3fc8dc146a7832cc61bc2b8b7..1812f88cfd52316114117f8318076f9447bea442 100644
--- a/navbar.h
+++ b/navbar.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef NAVBAR_H
-#define NAVBAR_H
+#pragma once
 
 #include <QWidget>
 
@@ -44,4 +43,3 @@ private:
     Ui::NavBar *ui;
 };
 
-#endif // NAVBAR_H
diff --git a/navstack.cpp b/navstack.cpp
index c1c6ddabb49cb7bfc30c108117dfaa19b9f3f2c7..00fd0ca4a9bf4d3e659a5f3188360d27a7585ecd 100644
--- a/navstack.cpp
+++ b/navstack.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/navstack.h b/navstack.h
index 477e8f82b377209ec403e792d15b879876236fab..176dac9d3df30c651b2c8acc89cafaed81ba1569 100644
--- a/navstack.h
+++ b/navstack.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef NAVSTACK_H
-#define NAVSTACK_H
+#pragma once
 
 #include <QStackedWidget>
 #include <QStack>
@@ -49,4 +48,3 @@ private:
     void setNavBar(NavWidget *navW);
 };
 
-#endif // NAVSTACK_H
diff --git a/navwidget.cpp b/navwidget.cpp
index a63a53c352e9d6edb2abbaf33c29d188681c389b..a1599b4e4266eb9621f737a72ad3a442b1709119 100644
--- a/navwidget.cpp
+++ b/navwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/navwidget.h b/navwidget.h
index b5a24dc6ad3ffa057cccec3586dfe0647d5d8071..f6b57c60700dff631bba390e9904c136dfdca54a 100644
--- a/navwidget.h
+++ b/navwidget.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef NAVWIDGET_H
-#define NAVWIDGET_H
+#pragma once
 
 #include <QWidget>
 
@@ -45,4 +44,3 @@ signals:
     void BackRequested();
 };
 
-#endif // NAVSIGNALHELPER_H
diff --git a/selectareadialog.cpp b/selectareadialog.cpp
index e290ce087abbbc666d2aa4e9df0d761316708baa..6f367b2bd3d68d117a25d5e97ea970b4c912bfbe 100644
--- a/selectareadialog.cpp
+++ b/selectareadialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/selectareadialog.h b/selectareadialog.h
index 42ed60469874c82be4a8cd420bc0ce26d5a7513b..682ba677a018a2558a3586e2e273baf8fb3edb46 100644
--- a/selectareadialog.h
+++ b/selectareadialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef SELECTAREADIALOG_H
-#define SELECTAREADIALOG_H
+#pragma once
 
 #include <QDialog>
 #include <QMouseEvent>
@@ -42,4 +41,3 @@ private:
      QPixmap originalPixmap_;
 };
 
-#endif // SELECTAREADIALOG_H
diff --git a/settingskey.h b/settingskey.h
index b25a7f511342ada07b66ebe031e0916216781f70..6d20a58a576c47dbd122bbd1c1f77de53a9be6bb 100644
--- a/settingskey.h
+++ b/settingskey.h
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef SETTINGSKEY_H
-#define SETTINGSKEY_H
+#pragma once
 
 namespace SettingsKey {
 
@@ -28,5 +27,4 @@ constexpr static char autoAnswer[] = "autoAnswer";
 
 #define accountAutoAnswer(A) (A+SettingsKey::autoAnswer)
 
-#endif // SETTINGSKEY_H
 
diff --git a/transferdialog.cpp b/transferdialog.cpp
index bf2470f0d9547538fc7a6d4e5817bf9d2d1c5741..df9da4060255c7522bf48412e04eea3bb19469a4 100644
--- a/transferdialog.cpp
+++ b/transferdialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/transferdialog.h b/transferdialog.h
index bb57907376c88624be5269e7c4bcc64bfeb92b6d..0448af032a60584057e4f141d767ea37ef3ad082 100644
--- a/transferdialog.h
+++ b/transferdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef TRANSFERDIALOG_H
-#define TRANSFERDIALOG_H
+#pragma once
 
 #include <QDialog>
 #include <QSortFilterProxyModel>
@@ -64,4 +63,3 @@ private:
     Call *selectedCall_;
 };
 
-#endif // TRANSFERDIALOG_H
diff --git a/utils.cpp b/utils.cpp
index 18515cb06d92f6d9e5696d6b4d2bfa51e9e9519a..b6f367c4396fa39a5efc1a22bcb31ad064060afb 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/utils.h b/utils.h
index 519a46ee862e95e1d7a73738660deb9e2deed255..694128e2ee48bbfefd177448f5c5041fa3fa6aa3 100644
--- a/utils.h
+++ b/utils.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef UTILS_H
-#define UTILS_H
+#pragma once
 
 //Needed for OS detection
 #include <QtGlobal>
@@ -43,5 +42,3 @@ public:
     static QString GetISODate();
 };
 
-
-#endif // UTILS_H
diff --git a/videooverlay.cpp b/videooverlay.cpp
index 635e80df1f810d19d52782e1014e98beff6c36c3..fb4169b5503d09a1de507e3e1a7df3e8db9cbe5f 100644
--- a/videooverlay.cpp
+++ b/videooverlay.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/videooverlay.h b/videooverlay.h
index 17cd770d098553df294455c3bf0568e412123138..2037876631399cf0999c041562849a83614c8a39 100644
--- a/videooverlay.h
+++ b/videooverlay.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef VIDEOOVERLAY_H
-#define VIDEOOVERLAY_H
+#pragma once
 
 #include <QWidget>
 #include <QMenu>
@@ -59,4 +58,3 @@ signals:
     void setChatVisibility(bool visible);
 };
 
-#endif // VIDEOOVERLAY_H
diff --git a/videoview.cpp b/videoview.cpp
index 90e6b458020677ac24a0ed40bdc472343f396775..ec620ef035b37475a4b9ad85c2ac3082fcbd476b 100644
--- a/videoview.cpp
+++ b/videoview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/videoview.h b/videoview.h
index 6a91b8c3e164249389dc7b9048e3a7cce77115ce..7799d6e142b71c8f54d73024c680dfae460adc39 100644
--- a/videoview.h
+++ b/videoview.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef VIDEOVIEW_H
-#define VIDEOVIEW_H
+#pragma once
 
 #include <QWidget>
 #include <QTimer>
@@ -65,4 +64,3 @@ signals:
     void setChatVisibility(bool visible);
 };
 
-#endif // VIDEOVIEW_H
diff --git a/videowidget.cpp b/videowidget.cpp
index aad2a0ee9526a50a32610bf02e0dea0d47bf3686..786e63f19600f156a28ed33eb19866c7f0c251b0 100644
--- a/videowidget.cpp
+++ b/videowidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/videowidget.h b/videowidget.h
index 6f7d2483b05daad6c7eb17918393243b73337f09..730910dc3027efd94e3a27b47459f59710af7e67 100644
--- a/videowidget.h
+++ b/videowidget.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef VIDEOWIDGET_H
-#define VIDEOWIDGET_H
+#pragma once
 
 #include <QWidget>
 #include <QPainter>
@@ -52,4 +51,3 @@ private:
     constexpr static int previewMargin_ = 15;
 };
 
-#endif // VIDEOWIDGET_H
diff --git a/windowscontactbackend.cpp b/windowscontactbackend.cpp
index ea6b3c2705f7875d89c5c76b22041e1795ddfa0c..da876b28175396458d54d5ce66389547bb8efa5b 100644
--- a/windowscontactbackend.cpp
+++ b/windowscontactbackend.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/windowscontactbackend.h b/windowscontactbackend.h
index 3418e16d56b65b299c04fe1be98a433b1c4f94a1..95064e1d9602015ad24c24465b7334bc7b537544 100644
--- a/windowscontactbackend.h
+++ b/windowscontactbackend.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef WINDOWSCONTACTBACKEND_H
-#define WINDOWSCONTACTBACKEND_H
+#pragma once
 
 #include <QObject>
 #include <QStandardPaths>
@@ -76,4 +75,3 @@ private:
     WindowsContactBackend* collection_;
 };
 
-#endif // WINDOWSCONTACTBACKEND_H
diff --git a/wizarddialog.cpp b/wizarddialog.cpp
index 28f1fd3c1cffeddd05b996e1f8aebdd2f7942765..0bc52cc5594e589733cad6f81bc3066185c87f9e 100644
--- a/wizarddialog.cpp
+++ b/wizarddialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
diff --git a/wizarddialog.h b/wizarddialog.h
index b3445e6c3f981d812dbbdfdf296540e0ed6954b6..66eff050233b1d24c2ca811a6f10e60fad2d619e 100644
--- a/wizarddialog.h
+++ b/wizarddialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * Copyright (C) 2015 by Savoir-Faire Linux                                *
+ * Copyright (C) 2015 by Savoir-faire Linux                                *
  * Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  **************************************************************************/
 
-#ifndef WIZARDDIALOG_H
-#define WIZARDDIALOG_H
+#pragma once
 
 #include <QDialog>
 #include <QtConcurrent/QtConcurrent>
@@ -50,4 +49,3 @@ private slots:
     void endSetup(Account* a);
 };
 
-#endif // WIZARDDIALOG_H